diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 8e38c3c64..bd359db97 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -150,7 +150,7 @@
       <var:component className="UIxSidenavToolbarTemplate" />
       <md-content md-scroll-y="md-scroll-y" class="md-flex md-hue-2">
         <!-- User's calendars -->
-        <section>
+        <section class="sg-section-list">
           <md-subheader class="md-hue-2">
             <div layout="row" layout-align="space-between center">
               <span><var:string label:value="Calendars"/></span>
@@ -184,9 +184,11 @@
                        sg-escape="app.revertEditing(calendar)"/>
               </md-input-container>
               <md-menu class="md-secondary" label:aria-label="Options">
-                <md-icon label:aria-label="Options"
-                         ng-click="$mdOpenMenu()"
-                         md-menu-origin="md-menu-origin">more_vert</md-icon>
+                <md-button class="md-icon-button" label:aria-label="Options"
+                           ng-click="$mdOpenMenu()"
+                           md-menu-origin="md-menu-origin">
+                  <md-icon>more_vert</md-icon>
+                </md-button>
                 <md-menu-content width="2">
                   <md-menu-item>
                     <md-button type="button" ng-click="app.editFolder(calendar)">
@@ -226,7 +228,7 @@
           </md-list>
         </section>
         <!-- Subscriptions -->
-        <section>
+        <section class="sg-section-list">
           <md-subheader class="md-hue-2">
             <div layout="row" layout-align="space-between center">
               <span><var:string label:value="Subscriptions"/></span>
@@ -246,7 +248,10 @@
                            ng-true-value="1"
                            ng-false-value="0"
                            label:aria-label="Enable"><!-- enable --></md-checkbox>
-              <p class="sg-item-name" ng-show="app.editMode != calendar.id">{{calendar.name}}</p>
+              <p class="sg-item-name" ng-show="app.editMode != calendar.id">
+                {{calendar.name}}
+                <span class="sg-counter-badge" ng-show="calendar.activeTasks">{{calendar.activeTasks}}</span>
+              </p>
               <md-input-container class="md-flex"
                                   ng-show="app.editMode == calendar.id">
                 <input class="sg-item-name" type="text"
@@ -257,10 +262,12 @@
                        sg-enter="app.renameFolder(calendar)"
                        sg-escape="app.revertEditing(calendar)"/>
               </md-input-container>
-              <md-menu class="md-secondary" label:aria-label="Options" ng-click="true">
-                <md-icon label:aria-label="Options"
+              <md-menu class="md-secondary" label:aria-label="Options">
+                <md-button class="md-icon-button" label:aria-label="Options"
                          ng-click="$mdOpenMenu()"
-                         md-menu-origin="md-menu-origin">more_vert</md-icon>
+                         md-menu-origin="md-menu-origin">
+                  <md-icon>more_vert</md-icon>
+                </md-button>
                 <md-menu-content width="2">
                   <md-menu-item>
                     <md-button type="button" ng-click="app.editFolder(calendar)">
@@ -290,7 +297,7 @@
           </md-list>
         </section>
         <!-- Web Calendars -->
-        <section>
+        <section class="sg-section-list">
           <md-subheader class="md-hue-2">
             <div layout="row" layout-align="space-between center">
               <span><var:string label:value="Web Calendars"/></span>
@@ -320,10 +327,12 @@
                        sg-enter="app.renameFolder(calendar)"
                        sg-escape="app.revertEditing(calendar)"/>
               </md-input-container>
-              <md-menu class="md-secondary" label:aria-label="Options" ng-click="true">
-                <md-icon label:aria-label="Options"
-                         ng-click="$mdOpenMenu()"
-                         md-menu-origin="md-menu-origin">more_vert</md-icon>
+              <md-menu class="md-secondary" label:aria-label="Options">
+                <md-button class="md-icon-button" label:aria-label="Options"
+                           ng-click="$mdOpenMenu()"
+                           md-menu-origin="md-menu-origin">
+                  <md-icon>more_vert</md-icon>
+                </md-button>
                 <md-menu-content width="2">
                   <md-menu-item>
                     <md-button type="button" ng-click="app.editFolder(calendar)">