diff --git a/app/assets/stylesheets/admin-manifest.sass b/app/assets/stylesheets/admin-manifest.sass
new file mode 100644
index 000000000..8ea1689d6
--- /dev/null
+++ b/app/assets/stylesheets/admin-manifest.sass
@@ -0,0 +1,9 @@
+//= require 'shared/custom-boostrap'
+@import shared/fonts
+@import shared/general
+@import nprogress
+@import nprogress-bootstrap
+@import typeaheadjs
+@import selectize
+@import selectize.bootstrap3
+@import admin/admin
diff --git a/app/assets/stylesheets/login.sass b/app/assets/stylesheets/admin/admin.sass
similarity index 66%
rename from app/assets/stylesheets/login.sass
rename to app/assets/stylesheets/admin/admin.sass
index c132ae9b0..66508a2fd 100644
--- a/app/assets/stylesheets/login.sass
+++ b/app/assets/stylesheets/admin/admin.sass
@@ -1,7 +1,3 @@
-body
-  padding-top: 40px
-  padding-bottom: 40px
-
 .form-signin
   max-width: 330px
   padding: 15px
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
deleted file mode 100644
index 66b50ac5b..000000000
--- a/app/assets/stylesheets/application.css.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-//= require 'custom-boostrap'
-@import "nprogress";
-@import "nprogress-bootstrap";
-@import "bootstrap-ext";
-@import "typeaheadjs";
-@import "selectize";
-@import "selectize.bootstrap3";
-@import "general";
-@import "app";
diff --git a/app/assets/stylesheets/custom-boostrap.scss b/app/assets/stylesheets/custom-boostrap.scss
deleted file mode 100644
index 20724c40d..000000000
--- a/app/assets/stylesheets/custom-boostrap.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif;
-$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif;
-$navbar-default-bg: #F69240;
-$navbar-default-brand-color: #fff;
-$navbar-default-link-color: #fff;
-$border-radius-base: 2px;
-$body-bg: #F8F8F8;
-$container-large-desktop: 1040px;
-$font-size-h1: 26px;
-$navbar-default-link-active-color: #333;
-
-@import "bootstrap-sprockets";
-@import "bootstrap";
diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss
deleted file mode 100644
index fbbef2d22..000000000
--- a/app/assets/stylesheets/fonts.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-@font-face {
-    font-family: 'EtelkaLightProRegular';
-    src: font_url('etelkalight-webfont.eot');
-    src: font_url('etelkalight-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('etelkalight-webfont.woff') format('woff'),
-         font_url('etelkalight-webfont.ttf') format('truetype'),
-         font_url('etelkalight-webfont.svg#EtelkaLightProRegular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'EtelkaLightProBold';
-    src: font_url('etelkalightbold-webfont.eot');
-    src: font_url('etelkalightbold-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('etelkalightbold-webfont.woff') format('woff'),
-         font_url('etelkalightbold-webfont.ttf') format('truetype'),
-         font_url('etelkalightbold-webfont.svg#EtelkaLightProBold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'EtelkaLightProItalic';
-    src: font_url('etelkalightitalic-webfont.eot');
-    src: font_url('etelkalightitalic-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('etelkalightitalic-webfont.woff') format('woff'),
-         font_url('etelkalightitalic-webfont.ttf') format('truetype'),
-         font_url('etelkalightitalic-webfont.svg#EtelkaLightProItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'InfoTextBold';
-    src: font_url('infotexb-webfont.eot');
-    src: font_url('infotexb-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('infotexb-webfont.woff') format('woff'),
-         font_url('infotexb-webfont.ttf') format('truetype'),
-         font_url('infotexb-webfont.svg#InfoTextBold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'InfoTextMedium';
-    src: font_url('infotexm-webfont.eot');
-    src: font_url('infotexm-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('infotexm-webfont.woff') format('woff'),
-         font_url('infotexm-webfont.ttf') format('truetype'),
-         font_url('infotexm-webfont.svg#InfoTextMedium') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'InfoTextRegular';
-    src: font_url('infotexn-webfont.eot');
-    src: font_url('infotexn-webfont.eot?#iefix') format('embedded-opentype'),
-         font_url('infotexn-webfont.woff') format('woff'),
-         font_url('infotexn-webfont.ttf') format('truetype'),
-         font_url('infotexn-webfont.svg#InfoTextRegular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
diff --git a/app/assets/stylesheets/registrar-manifest.css.scss b/app/assets/stylesheets/registrar-manifest.css.scss
deleted file mode 100644
index f6443df1e..000000000
--- a/app/assets/stylesheets/registrar-manifest.css.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import "fonts";
-@import "registrar";
-@import "bootstrap-sprockets";
-@import "bootstrap";
-@import "nprogress";
-@import "nprogress-bootstrap";
-@import "bootstrap-ext";
-@import "typeaheadjs";
-@import "selectize";
-@import "selectize.bootstrap3";
-@import "app";
diff --git a/app/assets/stylesheets/registrar-manifest.sass b/app/assets/stylesheets/registrar-manifest.sass
new file mode 100644
index 000000000..d5381599c
--- /dev/null
+++ b/app/assets/stylesheets/registrar-manifest.sass
@@ -0,0 +1,8 @@
+//= require 'shared/custom-boostrap'
+@import shared/fonts
+@import nprogress
+@import nprogress-bootstrap
+@import typeaheadjs
+@import selectize
+@import selectize.bootstrap3
+@import registrar/registrar
diff --git a/app/assets/stylesheets/registrar.sass b/app/assets/stylesheets/registrar/registrar.sass
similarity index 100%
rename from app/assets/stylesheets/registrar.sass
rename to app/assets/stylesheets/registrar/registrar.sass
diff --git a/app/assets/stylesheets/bootstrap-ext.sass b/app/assets/stylesheets/shared/custom-boostrap.sass
similarity index 78%
rename from app/assets/stylesheets/bootstrap-ext.sass
rename to app/assets/stylesheets/shared/custom-boostrap.sass
index 2fd5fb61e..8a7e2267d 100644
--- a/app/assets/stylesheets/bootstrap-ext.sass
+++ b/app/assets/stylesheets/shared/custom-boostrap.sass
@@ -1,3 +1,17 @@
+$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif
+$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif
+$navbar-default-bg: #F69240
+$navbar-default-brand-color: #fff
+$navbar-default-link-color: #fff
+$border-radius-base: 2px
+$body-bg: #F8F8F8
+$container-large-desktop: 1040px
+$font-size-h1: 26px
+$navbar-default-link-active-color: #333
+
+@import "bootstrap-sprockets"
+@import "bootstrap"
+
 .text-left-not-xs, .text-left-not-sm, .text-left-not-md, .text-left-not-lg
   text-align: left
 
@@ -57,3 +71,4 @@
     text-align: right
   .text-justify-lg
     text-align: justify
+
diff --git a/app/assets/stylesheets/shared/fonts.sass b/app/assets/stylesheets/shared/fonts.sass
new file mode 100644
index 000000000..f8a0d0c36
--- /dev/null
+++ b/app/assets/stylesheets/shared/fonts.sass
@@ -0,0 +1,46 @@
+@font-face
+  font-family: 'EtelkaLightProRegular'
+  src: font_url("etelkalight-webfont.eot")
+  src: font_url("etelkalight-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalight-webfont.woff") format("woff"), font_url("etelkalight-webfont.ttf") format("truetype"), font_url("etelkalight-webfont.svg#EtelkaLightProRegular") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'EtelkaLightProBold'
+  src: font_url("etelkalightbold-webfont.eot")
+  src: font_url("etelkalightbold-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalightbold-webfont.woff") format("woff"), font_url("etelkalightbold-webfont.ttf") format("truetype"), font_url("etelkalightbold-webfont.svg#EtelkaLightProBold") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'EtelkaLightProItalic'
+  src: font_url("etelkalightitalic-webfont.eot")
+  src: font_url("etelkalightitalic-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalightitalic-webfont.woff") format("woff"), font_url("etelkalightitalic-webfont.ttf") format("truetype"), font_url("etelkalightitalic-webfont.svg#EtelkaLightProItalic") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'InfoTextBold'
+  src: font_url("infotexb-webfont.eot")
+  src: font_url("infotexb-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexb-webfont.woff") format("woff"), font_url("infotexb-webfont.ttf") format("truetype"), font_url("infotexb-webfont.svg#InfoTextBold") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'InfoTextMedium'
+  src: font_url("infotexm-webfont.eot")
+  src: font_url("infotexm-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexm-webfont.woff") format("woff"), font_url("infotexm-webfont.ttf") format("truetype"), font_url("infotexm-webfont.svg#InfoTextMedium") format("svg")
+  font-weight: normal
+  font-style: normal
+
+
+@font-face
+  font-family: 'InfoTextRegular'
+  src: font_url("infotexn-webfont.eot")
+  src: font_url("infotexn-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexn-webfont.woff") format("woff"), font_url("infotexn-webfont.ttf") format("truetype"), font_url("infotexn-webfont.svg#InfoTextRegular") format("svg")
+  font-weight: normal
+  font-style: normal
diff --git a/app/assets/stylesheets/general.sass b/app/assets/stylesheets/shared/general.sass
similarity index 84%
rename from app/assets/stylesheets/general.sass
rename to app/assets/stylesheets/shared/general.sass
index 499f25167..bfc17103d 100644
--- a/app/assets/stylesheets/general.sass
+++ b/app/assets/stylesheets/shared/general.sass
@@ -220,6 +220,47 @@ body.login
     .form-control:focus
       z-index: 2
 
+.error-tab > a
+  color: #a94442 !important
+
+.edit-highlight
+  background-color: #E7E7E7
+
+.navbar-brand
+  line-height: 12px
+  padding-top: 20px
+  padding-bottom: 5px
+
+.navbar-brand small
+  display: block
+  font-size: 10px
+
+.footer
+  color: #777
+  padding-top: 15px
+  font-size: 10px
+
+.nowrap
+  white-space: nowrap
+
+.form-signin
+  max-width: 330px
+  padding: 15px
+  margin: 0 auto
+  input
+    margin-bottom: 10px
+
+.form-signin .form-control
+  position: relative
+  height: auto
+  -webkit-box-sizing: border-box
+  -moz-box-sizing: border-box
+  box-sizing: border-box
+  padding: 10px
+  font-size: 16px
+
+
+
 // fix label position for medium screen
 @media (min-width: 768px) and (max-width: 991px)
   .form-horizontal .control-label
diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb
index 579e68776..2ab1cec07 100644
--- a/app/controllers/admin/sessions_controller.rb
+++ b/app/controllers/admin/sessions_controller.rb
@@ -1,5 +1,5 @@
 class Admin::SessionsController < SessionsController
-  layout 'login'
+  layout 'admin/application'
 
   def create
     super
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 8bea17fdf..b77e06832 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -1,3 +1,4 @@
 class AdminController < ApplicationController
+  layout 'admin/application'
   before_action :authenticate_user!
 end
diff --git a/app/views/admin/sessions/login.haml b/app/views/admin/sessions/login.haml
index 6dec84141..015caac1d 100644
--- a/app/views/admin/sessions/login.haml
+++ b/app/views/admin/sessions/login.haml
@@ -1,6 +1,8 @@
+%h2.form-signin-heading.text-center Eesti Interneti SA
+%hr
 .form-signin
   / TODO: Refactor this when ID card login is done
-  = button_to 'ID card (user1)', 'sessions',
+  = button_to 'ID card (user1)', admin_sessions_path,
     class: 'btn btn-lg btn-primary btn-block', name: 'user1'
-  = button_to 'ID card (user2)', 'sessions',
+  = button_to 'ID card (user2)', admin_sessions_path,
     class: 'btn btn-lg btn-primary btn-block', name: 'user2'
diff --git a/app/views/layouts/application.haml b/app/views/layouts/admin/application.haml
similarity index 92%
rename from app/views/layouts/application.haml
rename to app/views/layouts/admin/application.haml
index 9748af1a3..7ae2e84c9 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/admin/application.haml
@@ -6,7 +6,7 @@
     %meta{content: "Full stack top-level domain (TLD) management.", name: "description"}/
     %meta{content: "Gitlab LTD", name: "author"}/
     = csrf_meta_tags
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
+    = stylesheet_link_tag 'admin-manifest', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = favicon_link_tag 'favicon.ico'
     %title Eesti Interneti SA
@@ -58,8 +58,9 @@
                   %li= link_to t(:repp_logs), admin_repp_logs_path
                   -# %li= link_to t(:background_jobs), admin_delayed_jobs_path
 
-          %ul.nav.navbar-nav.navbar-right
-            %li= link_to t('log_out', user: current_user), '/admin/logout'
+          - if signed_in?
+            %ul.nav.navbar-nav.navbar-right
+              %li= link_to t('log_out', user: current_user), '/admin/logout'
 
         / /.nav-collapse
     .container
diff --git a/app/views/layouts/login.haml b/app/views/layouts/login.haml
deleted file mode 100644
index e0b38d5de..000000000
--- a/app/views/layouts/login.haml
+++ /dev/null
@@ -1,27 +0,0 @@
-!!!
-%html{:lang => I18n.locale.to_s}
-  %head
-    %meta{:charset => "utf-8"}/
-    %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/
-    %meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/
-    %meta{:content => "Full stack top-level domain (TLD) management.", :name => "description"}/
-    %meta{:content => "Gitlab Ltd", :name => "author"}/
-    = csrf_meta_tags
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
-    = stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
-    = favicon_link_tag 'favicon.ico'
-    %title Eesti Interneti SA - Log In
-  %body{:style => env_style}
-    .container
-      .form-signin
-        - display = (flash.empty?) ? 'none' : 'block'
-        #flash{style: "display: #{display};"}
-          - type = (flash[:notice]) ? 'bg-success' : 'bg-danger'
-          .alert{class: type}= flash[:notice] || flash[:alert]
-        %h2.form-signin-heading.text-center Eesti Interneti SA
-        %hr
-        / TODO: Refactor this when ID card login is done
-        = button_to 'ID card (user1)', admin_sessions_path,
-          class: 'btn btn-lg btn-primary btn-block', name: 'user1'
-        = button_to 'ID card (user2)', admin_sessions_path,
-          class: 'btn btn-lg btn-primary btn-block', name: 'user2'
diff --git a/config/application.rb b/config/application.rb
index cce334dcc..2fbb4c10b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -39,6 +39,7 @@ module Registry
 
     # Precompile additional assets
     config.assets.precompile += %w(*.svg *.eot *.woff *.ttf)
+    config.assets.precompile += %w(admin-manifest.css)
 
     # Active Record used to suppresses errors raised within
     # `after_rollback`/`after_commit` callbacks and only printed them to the logs.