diff --git a/.gitignore b/.gitignore
index 1e05a9ae..3907573a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,11 @@ composer
 easyappointments.zip
 node_modules
 npm-debug.log
-src/application/logs/*
-!src/application/logs/index.html
+src/storage/cache/*
+!src/storage/cache/.htaccess
+!src/storage/cache/index.html
+src/storage/logs/*
+!src/storage/logs/index.html
+src/storage/uploads/*
+!src/storage/uploads/index.html
 src/config.php
diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index 22e96ccc..b9a28099 100644
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -48,31 +48,22 @@
         </div>
 
         <div id="calendar-actions" class="col-xs-12 col-md-7">
-            <div class="btn-group">
-                <?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER)
-                        && Config::GOOGLE_SYNC_FEATURE == TRUE) { ?>
-                    <button id="google-sync" class="btn btn-primary"
-                            title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
-                        <span class="glyphicon glyphicon-refresh"></span>
-                        <span><?php echo $this->lang->line('synchronize'); ?></span>
-                    </button>
-
-                    <button id="enable-sync" class="btn btn-default" data-toggle="button"
-                            title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>">
-                        <span class="glyphicon glyphicon-calendar"></span>
-                        <span><?php echo $this->lang->line('enable_sync'); ?></span>
-                    </button>
-                <?php } ?>
-
-                <button id="reload-appointments" class="btn btn-default"
-                        title="<?php echo $this->lang->line('reload_appointments_hint'); ?>">
-                    <span class="glyphicon glyphicon-repeat"></span>
-                    <?php echo $this->lang->line('reload'); ?>
+            <?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER)
+                    && Config::GOOGLE_SYNC_FEATURE == TRUE): ?>
+                <button id="google-sync" class="btn btn-primary"
+                        title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
+                    <span class="glyphicon glyphicon-refresh"></span>
+                    <span><?php echo $this->lang->line('synchronize'); ?></span>
                 </button>
-            </div>
+
+                <button id="enable-sync" class="btn btn-default" data-toggle="button"
+                        title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>">
+                    <span class="glyphicon glyphicon-calendar"></span>
+                    <span><?php echo $this->lang->line('enable_sync'); ?></span>
+                </button>
+            <?php endif ?>
 
             <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?>
-            <div class="btn-group">
                 <button id="insert-appointment" class="btn btn-primary"
                         title="<?php echo $this->lang->line('new_appointment_hint'); ?>">
                     <span class="glyphicon glyphicon-plus"></span>
@@ -84,8 +75,13 @@
                     <span class="glyphicon glyphicon-plus"></span>
                     <?php echo $this->lang->line('unavailable'); ?>
                 </button>
-            </div>
             <?php endif ?>
+
+            <button id="reload-appointments" class="btn btn-default"
+                    title="<?php echo $this->lang->line('reload_appointments_hint'); ?>">
+                <span class="glyphicon glyphicon-repeat"></span>
+                <?php echo $this->lang->line('reload'); ?>
+            </button>
         </div>
     </div>
 
diff --git a/src/application/views/backend/footer.php b/src/application/views/backend/footer.php
index 68f9b6a9..142e2f12 100644
--- a/src/application/views/backend/footer.php
+++ b/src/application/views/backend/footer.php
@@ -1,5 +1,5 @@
 <div id="footer">
-    <div id="footer-content">
+    <div id="footer-content" class="col-xs-12 col-md-6">
         Powered by
         <a href="http://easyappointments.org">Easy!Appointments
             <?php
@@ -20,7 +20,7 @@
         </a>
     </div>
 
-    <div id="footer-user-display-name">
+    <div id="footer-user-display-name" class="col-xs-12 col-md-6">
         <?php echo $this->lang->line('hello') . ', ' . $user_display_name; ?>!
     </div>
 </div>
diff --git a/src/application/views/backend/header.php b/src/application/views/backend/header.php
index ba119577..43b356e5 100755
--- a/src/application/views/backend/header.php
+++ b/src/application/views/backend/header.php
@@ -74,6 +74,11 @@
 <nav id="header" class="navbar">
     <div class="container-fluid">
         <div class="navbar-header">
+            <div id="header-logo" class="navbar-brand">
+                <img src="<?php echo $base_url; ?>/assets/img/logo.png">
+                <span><?php echo $company_name; ?></span>
+            </div>
+            
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#header-menu" 
                     aria-expanded="false" aria-controls="navbar">
                 <span class="sr-only">Toggle navigation</span>
@@ -81,11 +86,6 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-
-            <div id="header-logo" class="navbar-brand">
-                <img src="<?php echo $base_url; ?>/assets/img/logo.png">
-                <span><?php echo $company_name; ?></span>
-            </div>
         </div>
         
 
diff --git a/src/assets/css/backend.css b/src/assets/css/backend.css
index 2cbe01bd..e69ef948 100644
--- a/src/assets/css/backend.css
+++ b/src/assets/css/backend.css
@@ -40,7 +40,7 @@ root {
 
 #header #header-logo span {
     float: left;
-    font-size: 20px;
+    font-size: 16px;
     color: white;
     margin-top: 14px;
     font-weight: lighter;
@@ -57,7 +57,7 @@ root {
 
 #header #header-menu .menu-item {
     cursor: pointer;
-    min-width: 100px;
+    min-width: 130px;
     color: #FFF;
     text-align: center;
     text-decoration: none;
@@ -85,11 +85,13 @@ root {
     padding: 10px 15px;
     display: inline-block;
     float: left;
+    line-height: 2;
 }
 
 #footer #footer-user-display-name {
     display: inline-block;
     float: right;
+    text-align: right;
     padding: 10px 15px;
     font-weight: bold;
 }
@@ -147,6 +149,7 @@ body .modal-header h3 {
 
 body .modal-header .close {
     margin-top: 2px;
+    color: #12482a;
 }
 
 
@@ -255,7 +258,7 @@ body .jspTrack {
     color: white;
 }
 
-#calendar-page #calendar-filter > div {
+#calendar-page #calendar-filter .form-group {
     margin: 5px 0;
 }
 
@@ -273,7 +276,7 @@ body .jspTrack {
     background-color: #FFF;
     padding: 0 10px;
     background-position-x: 95%;
-    height: 36px;
+    min-width: 240px;
 }
 
 #calendar-page #calendar-filter select:disabled {
@@ -281,7 +284,11 @@ body .jspTrack {
     cursor: auto;
 }
 
-#calendar-page #calendar-actions > div {
+#calendar-page #calendar-actions {
+    text-align: right;
+}
+
+#calendar-page #calendar-actions > .btn {
     margin: 5px 0;
 }
 
@@ -312,6 +319,10 @@ body .jspTrack {
     background-image: url('../img/custom.jpg');
 }
 
+#calendar-page .fc-header {
+    margin-bottom: 10px;
+}
+
 #calendar .fc-header-title h2 {
     font-size: 16px;
     margin: 0px;
@@ -766,7 +777,50 @@ body .form-horizontal .controls {
     margin-left: 12px;
 }
 
+@media(max-width: 1200px) {
+    #header #header-menu .menu-item {
+        min-width: 100px;
+    }
+
+    #calendar-page #calendar-actions {
+        text-align: left;
+    }
+}
+
+@media(max-width: 860px) {
+    #header #header-menu .menu-item {
+        min-width: 85px;
+    }
+
+    #footer #footer-user-display-name {
+        text-align: left;
+    }
+
+    #calendar-page #calendar-filter label {
+        margin-bottom: 5px;
+    }
+}
+
 
 @media(max-width: 468px) {
-    #calendar .fc-header-title
+    #calendar-page .fc-header td {
+        display: block;
+        width: 70vw;
+        float: left;
+        margin: 10px auto;
+        text-align: left;
+    }
+
+    #calendar-page #calendar-actions .btn {
+        width: 100%;
+        margin: 5px 0;
+    }
+
+    .ui-dialog {
+        margin: 0 12px;
+    }
+
+    #calendar-page #calendar-filter select {
+        min-width: auto;
+    }
 }
diff --git a/src/assets/css/general.css b/src/assets/css/general.css
index 1c0fdf01..0c8b669e 100644
--- a/src/assets/css/general.css
+++ b/src/assets/css/general.css
@@ -20,6 +20,10 @@ body .custom-qtip {
     color: #258D53;
 }
 
+body .ui-widget {
+    font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif
+}
+
 body .ui-widget-overlay {
     background: #000 50% 50% repeat-x;
     opacity: .5;
@@ -34,9 +38,10 @@ body .ui-draggable .ui-dialog-titlebar {
     background: #35B66F;
     color: #FFF;
     font-size: 1.5em;
-    padding: 14px 10px;
+    font-weight: lighter;
+    padding: 12px 10px;
     border: none;
-    border-bottom: 4px solid #1A865F;
+    border-bottom: 4px solid #c0f1d6;
     margin-bottom: 10px;
 }
 
diff --git a/src/assets/js/backend_calendar.js b/src/assets/js/backend_calendar.js
index c9a1d2c8..90513c93 100644
--- a/src/assets/js/backend_calendar.js
+++ b/src/assets/js/backend_calendar.js
@@ -797,8 +797,8 @@ window.BackendCalendar = window.BackendCalendar || {};
      * @return {Number} Returns the calendar element height in pixels.
      */
     function _getCalendarHeight() {
-        var result = window.innerHeight - $('#footer').height() - $('#header').height()
-                - $('#calendar-toolbar').height() - 50; // 80 for fine tuning
+        var result = window.innerHeight - $('#footer').outerHeight() - $('#header').outerHeight()
+                - $('#calendar-toolbar').outerHeight() - 60; // 60 for fine tuning
         return (result > 500) ? result : 500; // Minimum height is 500px
     }