diff --git a/static/layout.css b/static/layout.css
index 48d442a..477b42d 100755
--- a/static/layout.css
+++ b/static/layout.css
@@ -1,3 +1,11 @@
+:root {
+    --app-h: 100vh;
+    --app-space-1: 8px;
+}
+
+
+
+
 /* 
  * -- BASE STYLES --
  * Most of these are inherited from Base, but I want to change a few.
@@ -22,6 +30,7 @@ a {
 .button {
     border-radius: 4px;
 }
+
 .delete-button {
     background: #9d2c2c;
     border: 1px solid #480b0b;
@@ -32,7 +41,8 @@ a {
  * -- LAYOUT STYLES --
  * This layout consists of three main elements, `#nav` (navigation bar), `#list` (server list), and `#main` (server content). All 3 elements are within `#layout`
  */
-#layout, #nav, #list, #main {
+#nav,
+#main {
     margin: 0;
     padding: 0;
 }
@@ -45,6 +55,7 @@ a {
     background: rgb(37, 42, 58);
     text-align: center;
 }
+
 /* Show the "Menu" button on phones */
 #nav .nav-menu-button {
     display: block;
@@ -55,8 +66,9 @@ a {
 
 /* When "Menu" is clicked, the navbar should be 80% height */
 #nav.active {
-    height: 80%;
+    height: 100%;
 }
+
 /* Don't show the navigation items... */
 .nav-inner {
     display: none;
@@ -78,19 +90,22 @@ a {
     border: none;
     text-align: left;
 }
-    #nav .pure-menu-link:hover,
-    #nav .pure-menu-link:focus {
-        background: rgb(55, 60, 90);
-    }
-    #nav .pure-menu-link {
-        color: #fff;
-        margin-left: 0.5em;
-    }
-    #nav .pure-menu-heading {
-        border-bottom: none;
-        font-size:110%;
-        color: rgb(75, 113, 151);
-    }
+
+#nav .pure-menu-link:hover,
+#nav .pure-menu-link:focus {
+    background: rgb(55, 60, 90);
+}
+
+#nav .pure-menu-link {
+    color: #fff;
+    margin-left: 0.5em;
+}
+
+#nav .pure-menu-heading {
+    border-bottom: none;
+    font-size: 110%;
+    color: rgb(75, 113, 151);
+}
 
 
 /*
@@ -110,94 +125,118 @@ a {
     margin-right: 0.5em;
     border-radius: 3px;
 }
+
 .server-label-personal {
     background: #ffc94c;
 }
+
 .server-label-work {
     background: #41ccb4;
 }
+
 .server-label-travel {
     background: #40c365;
 }
 
 
 /* server Item Styles */
-.server-item {
-    padding: 0.9em 1em;
-    border-bottom: 1px solid #ddd;
-    border-left: 6px solid transparent;
+.server-content-title {
+    padding: var(--app-space-1);
+    /* color: #ffffff; */
 }
-    .server-name {
-        text-transform: uppercase;
-    }
-    .server-name,
-    .server-info {
-        margin: 0;
-        font-size: 100%;
-    }
-    .server-info {
-        color: #999;
-        font-size: 80%;
-    }
-    .server-comment {
-        font-size: 90%;
-        margin: 0.4em 0;
-    }
-    .server-add {
-        cursor: pointer;
-        text-align: center;
-        font-size: 150%;
-        color: #999;
-    }
-    .server-add:hover {
-        color: black;
-    }
 
-.server-item-selected {
-    background: #eeeeee;
-}
-.server-item-unread {
-    border-left: 6px solid #1b98f8;
-}
-.server-item-broken {
-    border-left: 6px solid #880d06;
+.server-item {
+    padding: var(--app-space-1);
+    /* color: #ffffff; */
+    cursor: pointer;
 }
 
 .server-item:hover {
     background: #d1d0d0;
 }
 
+.server-name {
+    text-transform: uppercase;
+}
+
+.server-name,
+.server-info {
+    margin: 0;
+    font-size: 100%;
+}
+
+.server-info {
+    color: #999;
+    font-size: 80%;
+}
+
+.server-comment {
+    font-size: 90%;
+    margin: 0.4em 0;
+}
+
+.server-add {
+    cursor: pointer;
+    text-align: center;
+    font-size: 150%;
+    color: #999;
+}
+
+.server-add:hover {
+    color: black;
+}
+
+.server-item-selected {
+    background: #eeeeee;
+}
+
+.server-item-unread {
+    border-left: 6px solid #1b98f8;
+}
+
+.server-item-broken {
+    border-left: 6px solid #880d06;
+}
+
+
 /* server Content Styles */
-.server-content-header, .server-content-body, .server-content-footer {
+.server-content-header,
+.server-content-body,
+.server-content-footer {
     padding: 1em 2em;
 }
-    .server-content-header {
-        border-bottom: 1px solid #ddd;
-    }
 
-        .server-content-title {
-            margin: 0.5em 0 0;
-        }
-        .server-content-subtitle {
-            font-size: 1em;
-            margin: 0;
-            font-weight: normal;
-        }
-            .server-content-subtitle span {
-                color: #999;
-            }
-    .server-content-controls {
-        margin-top: 2em;
-        text-align: right;
-    }
-        .server-content-controls .secondary-button {
-            margin-bottom: 0.3em;
-        }
+.server-content-header {
+    border-bottom: 1px solid #ddd;
+}
 
-    .server-avatar {
-        width: 40px;
-        height: 40px;
-    }
+.server-content-title {
+    margin: 0.5em 0 0;
+}
+
+.server-content-subtitle {
+    font-size: 1em;
+    margin: 0;
+    font-weight: normal;
+}
+
+.server-content-subtitle span {
+    color: #999;
+}
+
+.server-content-controls {
+    margin-top: 2em;
+    text-align: right;
+}
+
+.server-content-controls .secondary-button {
+    margin-bottom: 0.3em;
+}
+
+.server-avatar {
+    width: 40px;
+    height: 40px;
+}
 
 
 /*
@@ -207,22 +246,17 @@ a {
  */
 @media (min-width: 40em) {
 
-    /* Move the layout over so we can fit the nav + list in on the left */
-    #layout {
-        padding-left:500px;
-        position: relative;
-    }
-
     /* These are position:fixed; elements that will be in the left 500px of the screen */
-    #nav, #list {
+    #nav {
         position: fixed;
         top: 0;
         bottom: 0;
         overflow: auto;
     }
+
     #nav {
-        margin-left:-500px;
-        width:150px;
+        /* margin-left: -500px; */
+        width: 150px;
         height: 100%;
     }
 
@@ -237,12 +271,6 @@ a {
         display: none;
     }
 
-    #list {
-        margin-left: -350px;
-        width: 100%;
-        height: 33%;
-        border-bottom: 1px solid #ddd;
-    }
 
     #main {
         position: fixed;
@@ -251,7 +279,8 @@ a {
         bottom: 0;
         left: 150px;
         overflow: auto;
-        width: auto; /* so that it's not 100% */
+        width: auto;
+        /* so that it's not 100% */
     }
 
 }
@@ -264,12 +293,7 @@ a {
 @media (min-width: 60em) {
 
     /* This will take up the entire height, and be a little thinner */
-    #list {
-        margin-left: -350px;
-        width:350px;
-        height: 100%;
-        border-right: 1px solid #ddd;
-    }
+
 
     /* This will now take up it's own column, so don't need position: fixed; */
     #main {
@@ -281,72 +305,122 @@ a {
 
 
 .alert {
-  position: absolute;
-  top: 1em;
-  right: 1em;
-  width: auto;
-  height: auto;
-  padding: 10px;
-  margin: 10px;
-  line-height: 1.8;
-  border-radius: 5px;
-  cursor: hand;
-  cursor: pointer;
-  font-family: sans-serif;
-  font-weight: 400;
+    position: absolute;
+    top: 1em;
+    right: 1em;
+    width: auto;
+    height: auto;
+    padding: 10px;
+    margin: 10px;
+    line-height: 1.8;
+    border-radius: 5px;
+    cursor: hand;
+    cursor: pointer;
+    font-family: sans-serif;
+    font-weight: 400;
 }
 
 .alertCheckbox {
-  display: none;
+    display: none;
 }
 
-:checked + .alert {
-  display: none;
+:checked+.alert {
+    display: none;
 }
 
 .alertText {
-  display: table;
-  margin: 0 auto;
-  text-align: center;
-  font-size: 150%;
+    display: table;
+    margin: 0 auto;
+    text-align: center;
+    font-size: 150%;
 }
 
 .alertClose {
-  float: right;
-  padding-top: 0px;
-  font-size: 120%;
+    float: right;
+    padding-top: 0px;
+    font-size: 120%;
 }
 
 .clear {
-  clear: both;
+    clear: both;
 }
 
 .info {
-  background-color: #EEE;
-  border: 1px solid #DDD;
-  color: #999;
+    background-color: #EEE;
+    border: 1px solid #DDD;
+    color: #999;
 }
 
 .success {
-  background-color: #EFE;
-  border: 1px solid #DED;
-  color: #9A9;
+    background-color: #EFE;
+    border: 1px solid #DED;
+    color: #9A9;
 }
 
 .notice {
-  background-color: #EFF;
-  border: 1px solid #DEE;
-  color: #9AA;
+    background-color: #EFF;
+    border: 1px solid #DEE;
+    color: #9AA;
 }
 
 .warning {
-  background-color: #FDF7DF;
-  border: 1px solid #FEEC6F;
-  color: #C9971C;
+    background-color: #FDF7DF;
+    border: 1px solid #FEEC6F;
+    color: #C9971C;
 }
 
 .error {
-  background-color: #FEE;
-  border: 1px solid #EDD;
-  color: #A66;
+    background-color: #FEE;
+    border: 1px solid #EDD;
+    color: #A66;
+}
+
+
+
+#layout {
+    display: grid;
+    grid-template-areas:
+        "menu entety-menu content";
+    height: var(--app-h);
+    justify-content: left;
+}
+
+#menu {
+    grid-area: menu;
+    width: 150px;
+    height: 100%;
+    background-color: #333;
+}
+
+#entety-menu {
+    grid-area: entety-menu;
+    width: 300px;
+    height: 100%;
+    background-color: #fff;
+}
+
+#content {
+    grid-area: content;
+    height: 100%;
+}
+
+@media (max-width: 60em) {
+    #layout {
+        display: grid;
+        grid-template-areas:
+            "menu"
+            "entety-menu"
+            "content";
+        grid-template-rows: min-content min-content;
+    }
+
+    #menu {
+        width: 100vw;
+        height: fit-content;
+    }
+    
+    #entety-menu {
+        width: 100vw;
+        height: initial;
+    }
 }
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index cb0d86a..1c4acea 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -11,13 +11,11 @@
 
 <body>
 
-    <div id="layout" class="content pure-g">
-        <div id="nav" class="pure-u-1-3">
-            <a href="#" id="menuLink" class="nav-menu-button">Menu</a>
-
+    <div id="layout">
+        <div id="menu">
+            <div id="nav">
+                <a href="#" id="menuLink" class="nav-menu-button">Menu</a>
             <div class="nav-inner">
-                <button onclick="location.href='/';" style="cursor:pointer;"
-                    class="primary-button pure-button">OutFleet</button>
                 <div class="pure-menu custom-restricted-width">
                     <ul class="pure-menu-list">
                         <li class="pure-menu-item"><a href="/" class="pure-menu-link">Servers</a></li>
@@ -39,7 +37,37 @@
                 </div>
             </div>
         </div>
+        </div>
         {% block content %}{% endblock %}
+        
+
+
+        <!-- <div id="nav" class="pure-u-1-3">
+            <a href="#" id="menuLink" class="nav-menu-button">Menu</a>
+
+            <div class="nav-inner">
+                <div class="pure-menu custom-restricted-width">
+                    <ul class="pure-menu-list">
+                        <li class="pure-menu-item"><a href="/" class="pure-menu-link">Servers</a></li>
+                        <li class="pure-menu-item"><a href="/clients" class="pure-menu-link">Clients</a></li>
+                        <li class="pure-menu-item"><a href="/sync" class="pure-menu-link">Sync status</a></li>
+                    </ul>
+                    <div style="padding-left: 20%;padding-top: 50px;">
+                        {% if K8S_NAMESPACE %}<abbr title="Works on K8S"><svg xmlns="http://www.w3.org/2000/svg" width="25%"
+                            viewBox="0 0 256 249">
+                            <path fill="#326de6"
+                                d="M82.085 244.934c-5.946 0-11.561-2.642-15.36-7.432L8.92 165.657c-3.799-4.79-5.285-10.9-3.799-16.847l20.645-89.682c1.321-5.946 5.285-10.736 10.736-13.378l83.571-39.97c2.643-1.32 5.616-1.981 8.589-1.981c2.973 0 5.945.66 8.588 1.982l83.572 39.804c5.45 2.642 9.414 7.432 10.735 13.378l20.645 89.682c1.322 5.946 0 12.057-3.798 16.847l-57.807 71.845c-3.799 4.624-9.414 7.432-15.36 7.432z" />
+                            <path fill="#fff"
+                                d="M128.495 7.928c2.313 0 4.625.495 6.772 1.486l83.572 39.804c4.294 2.147 7.597 6.111 8.588 10.736l20.645 89.682c1.156 4.79 0 9.745-3.138 13.543l-57.806 71.846c-2.973 3.798-7.598 5.945-12.387 5.945H82.085c-4.79 0-9.414-2.147-12.387-5.945l-57.806-71.846c-2.973-3.798-4.13-8.753-3.138-13.543l20.645-89.682c1.156-4.79 4.294-8.754 8.588-10.736L121.56 9.25c2.147-.826 4.624-1.321 6.936-1.321m0-7.763c-3.468 0-6.936.826-10.24 2.312l-83.571 39.97c-6.607 3.138-11.231 8.918-12.883 16.02L1.156 148.15c-1.651 7.102 0 14.369 4.625 20.15l57.806 71.845c4.46 5.615 11.231 8.753 18.333 8.753h92.655c7.102 0 13.874-3.138 18.333-8.753l57.807-71.846c4.624-5.615 6.276-13.047 4.624-20.15l-20.645-89.682c-1.651-7.102-6.276-12.882-12.882-16.02L138.57 2.476C135.432.991 131.964.165 128.495.165" />
+                            <path fill="#fff"
+                                d="M212.232 142.534c-.165 0-.165 0 0 0h-.165c-.165 0-.33 0-.33-.165c-.33 0-.66-.165-.991-.165c-1.156-.165-2.147-.33-3.138-.33c-.496 0-.991 0-1.652-.166h-.165c-3.468-.33-6.276-.66-8.919-1.486c-1.156-.496-1.486-1.156-1.817-1.817c0-.165-.165-.165-.165-.33l-2.147-.66a65.33 65.33 0 0 0-1.156-23.289a68.054 68.054 0 0 0-9.249-21.636l1.652-1.486v-.33c0-.826.165-1.652.825-2.478c1.982-1.817 4.46-3.303 7.433-5.12c.495-.33.99-.495 1.486-.826c.991-.495 1.817-.99 2.808-1.651c.165-.165.495-.33.826-.66c.165-.166.33-.166.33-.331c2.312-1.982 2.808-5.285 1.156-7.433c-.826-1.156-2.312-1.816-3.799-1.816c-1.32 0-2.477.495-3.633 1.321l-.33.33c-.33.165-.496.496-.826.661c-.826.826-1.487 1.486-2.147 2.312c-.33.33-.66.826-1.156 1.156c-2.313 2.478-4.46 4.46-6.607 5.946c-.495.33-.99.496-1.486.496c-.33 0-.661 0-.991-.166h-.33l-1.983 1.322c-2.147-2.312-4.459-4.294-6.771-6.276a65.958 65.958 0 0 0-34.519-13.709l-.165-2.147l-.33-.33c-.496-.496-1.156-.991-1.322-2.147c-.165-2.643.166-5.616.496-8.919v-.165c0-.496.165-1.156.33-1.652c.165-.99.33-1.982.496-3.138v-1.486c0-2.973-2.313-5.45-5.12-5.45c-1.322 0-2.643.66-3.634 1.651c-.99.991-1.486 2.312-1.486 3.799v1.321c0 1.156.165 2.147.495 3.138c.165.496.165.991.33 1.652v.165c.33 3.303.826 6.276.496 8.919c-.165 1.156-.826 1.651-1.321 2.147l-.33.33l-.166 2.147c-2.973.33-5.946.66-8.919 1.321c-12.717 2.808-23.948 9.25-32.701 18.498l-1.652-1.156h-.33c-.33 0-.661.165-.991.165c-.496 0-.991-.165-1.487-.495c-2.147-1.486-4.294-3.634-6.606-6.111c-.33-.33-.66-.826-1.156-1.156c-.661-.826-1.322-1.487-2.148-2.312c-.165-.166-.495-.33-.825-.661c-.165-.165-.33-.165-.33-.33a5.772 5.772 0 0 0-3.634-1.322c-1.487 0-2.973.661-3.799 1.817c-1.652 2.147-1.156 5.45 1.156 7.432c.165 0 .165.166.33.166c.33.165.496.495.826.66c.991.66 1.817 1.156 2.808 1.652c.496.165.991.495 1.487.826c2.972 1.816 5.45 3.303 7.432 5.12c.826.825.826 1.651.826 2.477v.33l1.651 1.487c-.33.495-.66.826-.826 1.321c-8.258 13.048-11.396 28.408-9.249 43.603l-2.147.66c0 .166-.165.166-.165.33c-.33.661-.826 1.322-1.817 1.817c-2.477.826-5.45 1.157-8.918 1.487h-.166c-.495 0-1.156 0-1.651.165c-.991 0-1.982.165-3.138.33c-.33 0-.66.166-.991.166c-.165 0-.33 0-.496.165c-2.973.66-4.79 3.468-4.294 6.11c.496 2.313 2.643 3.8 5.285 3.8c.496 0 .826 0 1.322-.166c.165 0 .33 0 .33-.165c.33 0 .66-.165.99-.165c1.157-.33 1.983-.66 2.974-1.156c.495-.165.99-.496 1.486-.66h.165c3.138-1.157 5.946-2.148 8.589-2.478h.33c.991 0 1.652.495 2.147.826c.165 0 .165.165.33.165l2.313-.33c3.964 12.221 11.561 23.122 21.636 31.05c2.312 1.816 4.624 3.303 7.102 4.79l-.991 2.146c0 .166.165.166.165.33c.33.661.66 1.487.33 2.643c-.99 2.478-2.477 4.955-4.294 7.763v.165c-.33.496-.66.826-.99 1.321c-.661.826-1.157 1.652-1.818 2.643c-.165.165-.33.495-.495.826c0 .165-.165.33-.165.33c-1.321 2.808-.33 5.946 2.147 7.102c.66.33 1.321.496 1.982.496c1.982 0 3.964-1.322 4.955-3.139c0-.165.165-.33.165-.33c.165-.33.33-.66.495-.826c.496-1.156.661-1.982.991-2.973l.496-1.486c1.156-3.303 1.982-5.946 3.468-8.258c.66-.991 1.487-1.156 2.147-1.487c.165 0 .165 0 .33-.165l1.157-2.147c7.267 2.808 15.195 4.294 23.122 4.294c4.79 0 9.745-.495 14.37-1.651a73.402 73.402 0 0 0 8.588-2.478l.99 1.817c.166 0 .166 0 .331.165c.826.165 1.486.496 2.147 1.487c1.321 2.312 2.312 5.12 3.468 8.258v.165l.496 1.486c.33.991.495 1.982.99 2.973c.166.33.331.496.496.826c0 .165.166.33.166.33c.99 1.982 2.972 3.139 4.954 3.139c.661 0 1.322-.166 1.982-.496c1.156-.66 2.147-1.652 2.478-2.973c.33-1.321.33-2.808-.33-4.129c0-.165-.166-.165-.166-.33c-.165-.33-.33-.66-.495-.826c-.496-.991-1.156-1.817-1.817-2.643c-.33-.495-.66-.825-.99-1.32v-.166c-1.818-2.808-3.47-5.285-4.295-7.763c-.33-1.156 0-1.816.165-2.642c0-.165.165-.165.165-.33l-.826-1.982c8.754-5.12 16.186-12.388 21.802-21.306c2.973-4.625 5.285-9.745 6.936-14.865l1.982.33c.166 0 .166-.165.33-.165c.661-.33 1.157-.825 2.148-.825h.33c2.643.33 5.45 1.32 8.589 2.477h.165c.495.165.99.495 1.486.66c.991.496 1.817.826 2.973 1.157c.33 0 .66.165.991.165c.165 0 .33 0 .495.165c.496.165.826.165 1.322.165c2.477 0 4.624-1.651 5.285-3.798c0-1.982-1.817-4.625-4.79-5.45m-76.47-8.093l-7.267 3.469l-7.267-3.469l-1.816-7.762l4.954-6.276h8.093l4.955 6.276zm43.108-17.176a52.078 52.078 0 0 1 1.156 16.68l-25.27-7.266c-2.312-.66-3.633-2.973-3.138-5.285c.165-.661.496-1.322.991-1.817l19.985-18.003c2.807 4.625 4.954 9.91 6.276 15.69m-14.204-25.6l-21.636 15.36c-1.817 1.156-4.295.825-5.781-.991c-.495-.496-.66-1.157-.826-1.817l-1.486-26.922a50.13 50.13 0 0 1 29.729 14.37M116.769 78.12c1.817-.33 3.468-.66 5.285-.99l-1.486 26.425c-.165 2.312-1.982 4.294-4.46 4.294c-.66 0-1.486-.165-1.982-.495L92.16 91.665c6.772-6.772 15.195-11.397 24.609-13.544m-32.537 23.453l19.654 17.507c1.817 1.487 1.982 4.294.496 6.111c-.496.66-1.156 1.156-1.982 1.322l-25.6 7.432c-.991-11.231 1.486-22.627 7.432-32.372m-4.46 44.759l26.262-4.46c2.147-.165 4.129 1.322 4.624 3.469c.165.99.165 1.817-.165 2.643l-10.075 24.278c-9.249-5.946-16.681-15.03-20.645-25.93m60.285 32.867c-3.799.826-7.598 1.321-11.562 1.321c-5.78 0-11.396-.99-16.68-2.642l13.047-23.618c1.321-1.487 3.468-2.147 5.285-1.156a7.04 7.04 0 0 1 1.982 1.816l12.717 22.958c-1.486.495-3.138.826-4.79 1.321m32.206-22.957c-4.129 6.606-9.58 11.891-15.855 16.02l-10.405-24.94c-.496-1.981.33-4.128 2.312-5.12c.66-.33 1.486-.495 2.312-.495l26.426 4.46c-.991 3.633-2.643 6.937-4.79 10.075" />
+                        </svg></abbr>{% endif %}
+                        <br><span style="color: aliceblue; font-size: smaller;">ver. {{ VERSION }}</span>
+                    </div>
+                </div>
+            </div>
+        </div> -->
+       
     </div>
     <!-- Script to make the Menu link work -->
     <!-- Just stripped down version of the js/ui.js script for the side-menu layout -->
diff --git a/templates/clients.html b/templates/clients.html
index 816bfcb..4f81c05 100644
--- a/templates/clients.html
+++ b/templates/clients.html
@@ -2,13 +2,12 @@
 
 {% block content %}
 
-<div id="list" class="pure-u-1-3" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
-    <div class="server-item pure-g">
-        <h1 class="server-content-title">Clients</h1>
-    </div>
+<div id="entety-menu">
+<div id="list">
+    <h1 class="server-content-title">Clients</h1>
     {% for client, values in CLIENTS.items() %}
     <div class="server-item server-item-{% if client == selected_client %}unread{% else %}selected{% endif %} pure-g">
-        <div class="pure-u-3-4" onclick="location.href='/clients?selected_client={{ client }}';">
+        <div class="" onclick="location.href='/clients?selected_client={{ client }}';">
             <h5 class="server-name">{{ values["name"] }}</h5>
             <h4 class="server-info">Allowed {{ values["servers"]|length }} server{% if values["servers"]|length >1 %}s{%endif%}</h4>
         </div>
@@ -21,11 +20,13 @@
     </div>
 
 </div>
+</div>
 
 {% if add_client %}
-    <div class="pure-u-1-3">
+<div id="content">
+    <div class="">
         <div class="server-content-header pure-g">
-            <div class="pure-u-1-2">
+            <div class="">
                 <h1 class="server-content-title">Add new client</h1>
             </div>
         </div>
@@ -33,11 +34,11 @@
         <form action="/add_client" class="pure-form pure-form-stacked" method="POST">
             <fieldset>
                 <div class="pure-g">
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text" class="pure-u-23-24" name="name" required placeholder="Name"/>
+                    <div class="pure-u-1 ">
+                        <input type="text" class="" name="name" required placeholder="Name"/>
                     </div>
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text" class="pure-u-23-24" name="comment"  placeholder="Comment"/>
+                    <div class="pure-u-1 ">
+                        <input type="text" class="" name="comment"  placeholder="Comment"/>
                     </div>
                             <div class="pure-checkbox">
                                 {% for server in SERVERS %}
@@ -54,15 +55,17 @@
         </form>
     </div>
     </div>
+</div>
 {% endif %}
 
 
 {% if selected_client and not add_client %}
     {% set client = CLIENTS[selected_client] %}
 
-    <div class="pure-u-1-2">
+    <div id="content">
+    <div class="">
         <div class="server-content-header pure-g">
-            <div class="pure-u-1-2">
+            <div class="">
                 <h1 class="server-content-title">{{client['name']}}</h1>
                 <h4 class="server-info">{{ client['comment'] }}</h4>
                 <h4 class="server-info">id {{ selected_client }}</h4>
@@ -73,11 +76,11 @@
         <form action="/add_client" class="pure-form pure-form-stacked" method="POST">
             <fieldset>
                 <div class="pure-g">
-                    <div class="pure-u-1 pure-u-md-1-3">
+                    <div class="pure-u-1 ">
                         <input type="text" class="pure-u-1" name="name" required value="{{client['name']}}"/>
                         <input type="hidden" class="pure-u-1" name="old_name" required value="{{client['name']}}"/>
                     </div>
-                    <div class="pure-u-1 pure-u-md-1-3">
+                    <div class="pure-u-1 ">
                         <input type="text" class="pure-u-1" name="comment" value="{{client['comment']}}"/>
                     </div>
                     <input type="hidden" class="pure-u-1" name="user_id" value="{{selected_client}}"/>
@@ -101,19 +104,23 @@
 
         <div>
             <h3>Invite text</h3><hr>
-            <textarea style="width: 100%; rows=10">
-Install OutLine VPN. Copy and paste below keys to OutLine client.
-Same keys will work simultaneously on many devices.
-{% for server in SERVERS -%}
+                <p>Install Outline VPN. Copy and paste the keys below into the Outline client.
+                The same keys can be used simultaneously on multiple devices.</p>
+                {% for server in SERVERS -%}
+                    {% if server.info()['local_server_id'] in client['servers'] %}
+                    {% set salt = bcrypt.gensalt() %}
+                    {% set secret_string = server.info()['local_server_id'] + selected_client %}
+                    {% set hash_secret = bcrypt.hashpw(
+                        password=secret_string.encode('utf-8'),
+                        salt=salt).decode('utf-8') %}
 
-{% if server.info()['local_server_id'] in client['servers'] %}
-{{server.info()['name']}}
-```{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}```
-{% endif %}
-{%- endfor -%}</textarea>
+                <p><b>Server location:</b> {{server.info()['name']}}</p>
+                <p><b>Client link:</b> {% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['local_server_id'][0:SECRET_LINK_LENGTH]}}{{selected_client[0:SECRET_LINK_LENGTH]}}{{hash_secret[SECRET_LINK_PREFIX|length:]}}#{{server.info()['comment']}}{% endif %}{% endfor %}</p>
+                {% endif %}
+                {%- endfor -%}
         </div>
             <hr>
-<div style="padding-top: 15px; padding-bottom: 15px">
+<div>
     <div class="pure-u-1">
         <h3>Dynamic Access Keys</h3>
         <table class="pure-table">
@@ -174,6 +181,7 @@ Same keys will work simultaneously on many devices.
          </form>
     </div>
     </div>
+</div>
 {% endif %}
 
 {% endblock %}
diff --git a/templates/index.html b/templates/index.html
index 648c062..1ba8014 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,10 +2,11 @@
 
 {% block content %}
 
-<div id="list" class="pure-u-1-3" xmlns="http://www.w3.org/1999/html">
-    <div class="server-item pure-g">
-        <h1 class="server-content-title">Servers</h1>
-    </div>
+
+       
+<div id="entety-menu">
+<div>
+    <h1 class="server-content-title">Servers</h1>
     {% for server in SERVERS %}
         {% set total_traffic = namespace(total_bytes=0) %}
         {% for key in server.data["keys"] %}
@@ -34,26 +35,28 @@
     </div>
 
 </div>
+</div>
 
 {% if add_server %}
-    <div class="pure-u-1-3">
+<div id="content">
+    <div >
         <div class="server-content-header pure-g">
-            <div class="pure-u-1-2">
+            <div >
                 <h1 class="server-content-title">Add new server</h1>
             </div>
         </div>
         <div class="server-content-body">
         <form action="/add_server" class="pure-form pure-form-stacked" method="POST">
             <fieldset>
-                <div class="pure-g">
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text" class="pure-u-23-24" name="url" placeholder="Server management URL"/>
+                <div >
+                    <div >
+                        <input type="text"  name="url" placeholder="Server management URL"/>
                     </div>
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text"class="pure-u-23-24" name="cert" placeholder="Certificate"/>
+                    <div >
+                        <input type="text" name="cert" placeholder="Certificate"/>
                     </div>
-                    <div class="pure-u-1 pure-u-md-1-3">
-                        <input type="text" class="pure-u-23-24" name="comment"  placeholder="Comment"/>
+                    <div >
+                        <input type="text"  name="comment"  placeholder="Comment"/>
                     </div>
                 </div>
                 <button type="submit" class="pure-button pure-input-1 pure-button-primary">Add</button>
@@ -61,9 +64,9 @@
         </form>
     </div>
     </div>
+</div>
 {% endif %}
 
-
 {% if SERVERS|length != 0 and not add_server %}
 
     {% if selected_server is none %}
@@ -71,11 +74,12 @@
     {% else %}
       {% set server = SERVERS[selected_server|int] %}
     {% endif %}
-    <div id="main" class="pure-u-1">
+    <div id="content">
+    <div id="main" >
         <div class="server-content">
             <div class="server-content-header pure-g">
-                <div class="pure-u-1-2">
-                    <h1 class="server-content-title">{{server.info()["name"]}}</h1>
+                <div>
+                    <h1 class="content-title">{{server.info()["name"]}}</h1>
                     <p class="server-content-subtitle">
                         <span>v.{{server.info()["version"]}} {{server.info()["local_server_id"]}}</span>
                     </p>
@@ -95,35 +99,35 @@
     <form class="pure-form pure-form-stacked" method="POST">
         <fieldset>
             <div class="pure-g">
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="name">Server Name</br>This will not be exposed to client</label>
-                    <input type="text" id="name" class="pure-u-23-24" name="name" value="{{server.info()['name']}}"/>
+                    <input type="text" id="name" class="" name="name" value="{{server.info()['name']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="comment">Comment</br>This will be exposed to client and will be used as "Server name" in client Outline app</label>
-                    <input type="text" id="comment" class="pure-u-23-24" name="comment" value="{{server.info()['comment']}}"/>
+                    <input type="text" id="comment" class="" name="comment" value="{{server.info()['comment']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1">
                     <label for="port_for_new_access_keys">Port For New Access Keys</label>
-                    <input type="text" id="port_for_new_access_keys" class="pure-u-23-24" name="port_for_new_access_keys" value="{{server.info()['port_for_new_access_keys']}}"/>
+                    <input type="text" id="port_for_new_access_keys"  name="port_for_new_access_keys" value="{{server.info()['port_for_new_access_keys']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="hostname_for_access_keys">Hostname For Access Keys</label>
-                    <input type="text" id="hostname_for_access_keys" class="pure-u-23-24" name="hostname_for_access_keys" value="{{server.info()['hostname_for_access_keys']}}"/>
+                    <input type="text" id="hostname_for_access_keys"  name="hostname_for_access_keys" value="{{server.info()['hostname_for_access_keys']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="url">Server URL</label>
-                    <input type="text" readonly id="url" class="pure-u-23-24" name="url" value="{{server.info()['url']}}"/>
+                    <input type="text" readonly id="url"  name="url" value="{{server.info()['url']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="cert">Server Access Certificate</label>
-                    <input type="text" readonly id="cert" class="pure-u-23-24" name="cert" value="{{server.info()['cert']}}"/>
+                    <input type="text" readonly id="cert"  name="cert" value="{{server.info()['cert']}}"/>
                 </div>
-                <div class="pure-u-1 pure-u-md-1-3">
+                <div class="pure-u-1 ">
                     <label for="created_timestamp_ms">Created</label>
-                    <input type="text" readonly id="created_timestamp_ms" class="pure-u-23-24" name="created_timestamp_ms" value="{{format_timestamp(server.info()['created_timestamp_ms']) }}"/>
+                    <input type="text" readonly id="created_timestamp_ms"  name="created_timestamp_ms" value="{{format_timestamp(server.info()['created_timestamp_ms']) }}"/>
                 </div>
-                <input type="hidden" readonly id="server_id" class="pure-u-23-24" name="server_id" value="{{server.info()['local_server_id']}}"/>
+                <input type="hidden" readonly id="server_id"  name="server_id" value="{{server.info()['local_server_id']}}"/>
             </div>
             <p>Share anonymous metrics</p>
             <label for="metrics_enabled" class="pure-radio">
@@ -144,6 +148,7 @@
             </div>
         </div>
     </div>
+</div>
 
 {% endif %}