diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index f9b602460..0d56add00 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -10,8 +10,14 @@
     const:jsFiles="Common/SOGoAuthentication.js"
     const:popup="YES"
     ><var:string var:value="doctype" const:escapeHTML="NO"/>
-
-<md-content md-scroll-y="true" layout="center center">
+  <!--
+    MAIN CONTENT ROW
+    Content of the application view injected injected in the element bellow
+    MUST be the first html element after body
+    SHOULD  be a main tag (with role="main")
+  -->
+  <main class="view md-layout-fill md-layout-padding" ui-view="login" layout="row" layout-align="center start">
+<md-content class="md-padding" md-scroll-y="true">
   <div data-ng-controller="loginController">
 
     <script type="text/javascript">
@@ -38,9 +44,9 @@
     </nav> -->
     <div id="login">
       <div id="logo">
-        <img const:alt="*" id="splash" rsrc:src="img/sogo-logo.png"/>
+        <img const:alt="*" id="splash" rsrc:src="img/sogo-full.svg"/>
       </div>
-      <form name="loginForm" data-ng-controller="loginController" data-ng-submit="login(creds)">
+      <form name="loginForm" layout="column" data-ng-controller="loginController" data-ng-submit="login(creds)">
         <var:if condition="hasLoginSuffix"><input type="hidden" data-ng-model="creds.loginSuffix" var:value="loginSuffix"/></var:if>
         <div data-ng-show="warning" data-ng-cloak="ng-cloak" data-alert="data-alert" class="alert-box radius warning">{{warning}}</div>
         <md-input-container>
@@ -98,4 +104,5 @@
     </div>
   </div>
 </md-content>
+</main>
 </var:component>
diff --git a/UI/WebServerResources/scss/views/LoginUI.scss b/UI/WebServerResources/scss/views/LoginUI.scss
new file mode 100644
index 000000000..13042112b
--- /dev/null
+++ b/UI/WebServerResources/scss/views/LoginUI.scss
@@ -0,0 +1,10 @@
+/*! loginUI.scss */
+
+
+[ui-view="login"] > md-content {
+  width: grid-step(5);
+}
+
+[id=logo] img {
+  max-width: 100%;
+}
diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss
index c17020543..d9380f4a1 100644
--- a/UI/WebServerResources/scss/views/_view.scss
+++ b/UI/WebServerResources/scss/views/_view.scss
@@ -5,7 +5,7 @@
 /// @module views
 ///
 ///
-
+@import 'LoginUI.scss';
 @import 'MailerUI.scss';
 @import 'ContactsUI.scss';
 @import 'MessageEditorUI';