diff --git a/UI/Templates/AdministrationUI/UIxAdministration.wox b/UI/Templates/AdministrationUI/UIxAdministration.wox
index e9d625fa7..c4902605b 100644
--- a/UI/Templates/AdministrationUI/UIxAdministration.wox
+++ b/UI/Templates/AdministrationUI/UIxAdministration.wox
@@ -30,7 +30,7 @@
       </md-content>
     </md-sidenav>
 
-    <section layout="column" class="sg-app-content layout-fill" ui-view="module"><!-- admin module --></section>
+    <section layout="column" class="layout-fill" ui-view="module"><!-- admin module --></section>
 
   </script>
 
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index c87523a3e..1030442d6 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -183,7 +183,7 @@
       </md-content>
     </md-sidenav>
 
-    <section layout="column" class="sg-app-content layout-fill" ui-view="addressbook"><!-- contacts list --></section>
+    <section layout="column" class="layout-fill" ui-view="addressbook"><!-- contacts list --></section>
   </script>
 
   <script type="text/ng-template" id="addressbook">
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 51e94f020..452eec7d1 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -188,7 +188,7 @@
       </md-content>
     </md-sidenav>
 
-    <section layout="column" class="sg-app-content layout-fill" ui-view="mailbox"><!-- messages list --></section>
+    <section layout="column" class="layout-fill" ui-view="mailbox"><!-- messages list --></section>
   </script>
 
   <script type="text/ng-template" id="UIxMailFolderTemplate">
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 362d1b261..5e3e04949 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -347,7 +347,7 @@
     </md-sidenav>
 
     <!-- Main section -->
-    <section layout="column" class="sg-app-content layout-fill"
+    <section layout="column" class="layout-fill"
              ng-controller="CalendarListController as list">
       <md-toolbar layout="row" layout-align="space-between center" class="toolbar-main" >
         <var:component className="UIxTopnavToolbarTemplate" />
diff --git a/UI/WebServerResources/scss/core/layout.scss b/UI/WebServerResources/scss/core/layout.scss
index 3d2cba933..af5941f8e 100644
--- a/UI/WebServerResources/scss/core/layout.scss
+++ b/UI/WebServerResources/scss/core/layout.scss
@@ -178,10 +178,9 @@
 //}
 
 // App container for responsive
-.sg-app-content {
+body {
   @include to(sm) {
-    width: 100%;
     overflow-x: hidden;
+    width: 100%;
   }
-
 }
diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss
index b5d3b6dd3..336bff18b 100644
--- a/UI/WebServerResources/scss/views/_view.scss
+++ b/UI/WebServerResources/scss/views/_view.scss
@@ -13,10 +13,6 @@
 }
 
 body {
-  @include to(xs) {
-    overflow: hidden;
-  }
-
   &.popup {
     .viewer {
       width: 100%;