diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 1f0db1457..08be4dc87 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -46,12 +46,9 @@
         </var:if-ie>
       </head>
 
-      <body var:data-ng-app = "angularModule" var:class = "bodyClasses"
-          >
-        <var:if condition = "isCompatibleBrowser"
-            >
-          <var:if condition = "singleWindowModeEnabled"
-              >
+      <body var:data-ng-app = "angularModule" var:class = "bodyClasses">
+        <var:if condition = "isCompatibleBrowser">
+          <var:if condition = "singleWindowModeEnabled">
             <div id = "popupFrame" style = "display: none;">
               <iframe width = "100%" height = "100%" src = "/SOGo/loading"><!-- space --></iframe>
             </div>
@@ -83,8 +80,8 @@
 
           <var:component-content />
           <!--FIXME : make sure the .md-button.md-default-theme[disabled] is "contrast aware" disabled labels are actualy almost invisible -->
-
-          <md-toolbar class = "sg-bottombar" layout = "row" layout-align = "center center">
+<!-- BOTTOM-BAR -->
+          <md-toolbar class = "sg-bottombar" layout = "row" layout-align = "center center" hide-sm="hide-sm"> <!--todo : transform show/hide attributes to classes. Adjust body padding accordingly to bottombar visibility (in media query) -->
             <var:if condition = "userHasCalendarAccess">
               <var:if condition = "isCalendar">
                 <md-button ng-disabled = "true">
@@ -136,6 +133,7 @@
             </var:if>
           </md-toolbar>
 
+          <!-- Javascripot imports -->
           <script type = "text/javascript">
             var ApplicationBaseURL = '<var:string value = "modulePath" />';
             var ResourcesURL = '<var:string value = "applicationPath" />.woa/WebServerResources';
@@ -177,6 +175,7 @@
           <script type = "text/javascript" rsrc:src = "js/Common/ui.js"><!-- space --></script>
           <script type = "text/javascript" rsrc:src = "js/Common/ui-common.js"><!-- space --></script>
           <script type = "text/javascript" rsrc:src = "js/Common/ui-desktop.js"><!-- space --></script>
+
           <var:if condition = "hasProductSpecificJavaScript">
             <script type = "text/javascript"
                 var:src = "productJavaScriptURL"><!-- space --></script>
@@ -215,6 +214,7 @@
             </a>
           </div>
         </noscript>
+
       </body>
     </html>
   </var:if>
