diff --git a/src/panels/calendar/ha-big-calendar.js b/src/panels/calendar/ha-big-calendar.js
index 7aa3d8e8f8..54145e5e2e 100644
--- a/src/panels/calendar/ha-big-calendar.js
+++ b/src/panels/calendar/ha-big-calendar.js
@@ -28,7 +28,17 @@ class HaBigCalendar extends EventsMixin(PolymerElement) {
       <div id="root"></div>`;
   }
 
-  update(events) {
+  static get properties() {
+    return {
+      events: {
+        type: Array,
+        observer: '_update',
+      },
+
+    };
+  }
+
+  _update(events) {
     const allViews = BigCalendar.Views.values;
 
     const BCElement = React.createElement(
@@ -37,16 +47,16 @@ class HaBigCalendar extends EventsMixin(PolymerElement) {
         views: allViews,
         popup: true,
         onNavigate: (date, viewName) => this.fire('navigate', { date, viewName }),
-        onView: viewName => this.fire('view', { viewName }),
-        eventPropGetter: this.setEventStyle,
-        defaultView: this.defaultView,
+        onView: viewName => this.fire('view-changed', { viewName }),
+        eventPropGetter: this._setEventStyle,
+        defaultView: DEFAULT_VIEW,
         defaultDate: new Date(),
       }
     );
     render(BCElement, this.$.root);
   }
 
-  setEventStyle(event) {
+  _setEventStyle(event) {
     // https://stackoverflow.com/questions/34587067/change-color-of-react-big-calendar-events
     const newStyle = {};
     if (event.color) {
@@ -54,30 +64,6 @@ class HaBigCalendar extends EventsMixin(PolymerElement) {
     }
     return { style: newStyle };
   }
-
-  static get properties() {
-    return {
-      dateUpdated: Object,
-
-      viewUpdated: Object,
-
-      defaultView: {
-        type: String,
-        value: DEFAULT_VIEW
-      },
-
-      defaultDate: {
-        type: Object,
-        value: new Date()
-      },
-
-      events: {
-        type: Array,
-        observer: 'update',
-      },
-
-    };
-  }
 }
 
 customElements.define('ha-big-calendar', HaBigCalendar);
diff --git a/src/panels/calendar/ha-panel-calendar.js b/src/panels/calendar/ha-panel-calendar.js
index 36a8677b6d..b5a48a28a9 100644
--- a/src/panels/calendar/ha-panel-calendar.js
+++ b/src/panels/calendar/ha-panel-calendar.js
@@ -38,6 +38,11 @@ class HaPanelCalendar extends LocalizeMixin(PolymerElement) {
         #calendars {
           padding-right: 16px;
           width: 15%;
+          min-width: 170px;
+        }
+
+        paper-item {
+          cursor: pointer;
         }
 
         div.all_calendars {
@@ -50,6 +55,13 @@ class HaPanelCalendar extends LocalizeMixin(PolymerElement) {
           font-weight: normal;
         }
 
+        :host([narrow]) .content {
+          flex-direction: column;
+        }
+        :host([narrow]) #calendars {
+          margin-bottom: 24px;
+          width: 100%;
+        }
       </style>
 
       <app-header-layout has-scrolling-region>
@@ -63,10 +75,13 @@ class HaPanelCalendar extends LocalizeMixin(PolymerElement) {
         <div class="flex content">
           <div id="calendars" class="layout vertical wrap">
             <paper-card heading="Calendars">
-              <div class="all_calendars">
-                <paper-checkbox id="all_calendars" on-change="checkAll" checked>All calendars</paper-checkbox>
-              </div>
-              <paper-listbox id="calendar_list" multi on-selected-items-changed="_fetchData" selected-values="{{selectedCalendars}}" attr-for-selected="item-name">
+              <paper-listbox
+                id="calendar_list"
+                multi
+                on-selected-items-changed="_fetchData"
+                selected-values="{{selectedCalendars}}"
+                attr-for-selected="item-name"
+              >
                 <template is="dom-repeat" items="[[calendars]]">
                   <paper-item item-name="[[item.entity_id]]">
                     <span class="calendar_color" style$="background-color: [[item.color]]"></span>
@@ -81,8 +96,8 @@ class HaPanelCalendar extends LocalizeMixin(PolymerElement) {
             <ha-big-calendar
               default-date="[[currentDate]]"
               default-view="[[currentView]]"
-              on-navigate='handleNavigate'
-              on-view='handleView'
+              on-navigate='_handleNavigate'
+              on-view='_handleViewChanged'
               events="[[events]]">
             </ha-big-calendar>
           </div>
@@ -90,99 +105,6 @@ class HaPanelCalendar extends LocalizeMixin(PolymerElement) {
       </app-header-layout>`;
   }
 
-  connectedCallback() {
-    super.connectedCallback();
-    this._fetchData = this._fetchData.bind(this);
-    // TODO implement calendar_updated event
-    // this.hass.connection.subscribeEvents(this._fetchData, 'calendar_updated')
-    //  .then(function (unsub) { this._unsubEvents = unsub; }.bind(this));
-    this._fetchCalendar();
-  }
-
-  _fetchCalendar() {
-    // Fetch calendar list
-    this.hass.callApi('get', 'calendars')
-      .then((result) => {
-        this.calendars = result;
-      });
-  }
-
-  _fetchData() {
-    // TODO: Improve me
-    var start = dates.firstVisibleDay(this.currentDate).toISOString();
-    var end = dates.lastVisibleDay(this.currentDate).toISOString();
-    // var dates = this._getDateRange();
-    // var start = dates[0];
-    // var end = dates[1];
-    // Fetch calendar list
-    this._fetchCalendar();
-    // Fetch events for selected calendar
-    const params = encodeURI(`?start=${start}&end=${end}`);
-    const calls = this.selectedCalendars.map(cal => this.hass.callApi('get', `calendar/${cal}${params}`));
-    Promise.all(calls).then((results) => {
-      var tmpEvents = [];
-
-      results.forEach((res) => {
-        res.forEach((ev) => {
-          ev.start = new Date(ev.start);
-          if (ev.end) {
-            ev.end = new Date(ev.end);
-          } else {
-            ev.end = null;
-          }
-          tmpEvents.push(ev);
-        });
-      });
-      this.events = tmpEvents;
-    });
-  }
-
-  _getDateRange() {
-    // TODO: Delete me
-    var startDate;
-    var endDate;
-    if (this.currentView === 'day') {
-      startDate = moment(this.currentDate).startOf('day');
-      endDate = moment(this.currentDate).startOf('day');
-    } else if (this.currentView === 'week') {
-      startDate = moment(this.currentDate).startOf('isoWeek');
-      endDate = moment(this.currentDate).endOf('isoWeek');
-    } else if (this.currentView === 'month') {
-      startDate = moment(this.currentDate).startOf('month').subtract(7, 'days');
-      endDate = moment(this.currentDate).endOf('month').add(7, 'days');
-    } else if (this.currentView === 'agenda') {
-      startDate = moment(this.currentDate).startOf('day');
-      endDate = moment(this.currentDate).endOf('day').add(1, 'month');
-    }
-    return [startDate.toISOString(), endDate.toISOString()];
-  }
-
-  handleView(ev) {
-    // Calendar view changed
-    this.currentView = ev.detail.viewName;
-    this._fetchData();
-  }
-
-  handleNavigate(ev) {
-    // Calendar date range changed
-    this.currentDate = ev.detail.date;
-    this.currentView = ev.detail.viewName;
-    this._fetchData();
-  }
-
-  checkAll(ev) {
-    // Check all calendars
-    if (ev.target.checked) {
-      const selectedIndex = this.selectedCalendars
-        .map(x => this.calendars.map(y => y.entity_id).indexOf(x));
-      for (let i = 0; i < this.calendars.length; i++) {
-        if (selectedIndex.indexOf(i) === -1) {
-          this.$.calendar_list.selectIndex(i);
-        }
-      }
-    }
-  }
-
   static get properties() {
     return {
       hass: Object,
@@ -214,7 +136,7 @@ class HaPanelCalendar extends LocalizeMixin(PolymerElement) {
 
       narrow: {
         type: Boolean,
-        value: false,
+        reflectToAttribute: true,
       },
 
       showMenu: {
@@ -224,6 +146,74 @@ class HaPanelCalendar extends LocalizeMixin(PolymerElement) {
 
     };
   }
+
+  connectedCallback() {
+    super.connectedCallback();
+    this._fetchCalendars();
+  }
+
+  _fetchCalendars() {
+    this.hass.callApi('get', 'calendars')
+      .then((result) => {
+        this.calendars = result;
+        this.selectedCalendars = result.map(cal => cal.entity_id);
+      });
+  }
+
+  _fetchData() {
+    const start = dates.firstVisibleDay(this.currentDate).toISOString();
+    const end = dates.lastVisibleDay(this.currentDate).toISOString();
+    const params = encodeURI(`?start=${start}&end=${end}`);
+    const calls = this.selectedCalendars.map(cal => this.hass.callApi('get', `calendars/${cal}${params}`));
+    Promise.all(calls).then((results) => {
+      const tmpEvents = [];
+
+      results.forEach((res) => {
+        res.forEach((ev) => {
+          ev.start = new Date(ev.start);
+          if (ev.end) {
+            ev.end = new Date(ev.end);
+          } else {
+            ev.end = null;
+          }
+          tmpEvents.push(ev);
+        });
+      });
+      this.events = tmpEvents;
+    });
+  }
+
+  _getDateRange() {
+    let startDate;
+    let endDate;
+    if (this.currentView === 'day') {
+      startDate = moment(this.currentDate).startOf('day');
+      endDate = moment(this.currentDate).startOf('day');
+    } else if (this.currentView === 'week') {
+      startDate = moment(this.currentDate).startOf('isoWeek');
+      endDate = moment(this.currentDate).endOf('isoWeek');
+    } else if (this.currentView === 'month') {
+      startDate = moment(this.currentDate).startOf('month').subtract(7, 'days');
+      endDate = moment(this.currentDate).endOf('month').add(7, 'days');
+    } else if (this.currentView === 'agenda') {
+      startDate = moment(this.currentDate).startOf('day');
+      endDate = moment(this.currentDate).endOf('day').add(1, 'month');
+    }
+    return [startDate.toISOString(), endDate.toISOString()];
+  }
+
+  _handleViewChanged(ev) {
+    // Calendar view changed
+    this.currentView = ev.detail.viewName;
+    this._fetchData();
+  }
+
+  _handleNavigate(ev) {
+    // Calendar date range changed
+    this.currentDate = ev.detail.date;
+    this.currentView = ev.detail.viewName;
+    this._fetchData();
+  }
 }
 
 customElements.define('ha-panel-calendar', HaPanelCalendar);