diff --git a/api/index.php b/api/index.php
index 59b77a8..6b458bb 100644
--- a/api/index.php
+++ b/api/index.php
@@ -135,6 +135,8 @@ function close($db, $commit=False)
 
 switch ($method) {
     case "lang":
+      if( empty($default_lang) or 
+          !isset($default_lang) ) $default_lang = "en";
         print json_encode($lang[$default_lang]);
         break;
     case "listEmpty":
diff --git a/css/list.css b/css/list.css
index c9ccdc9..413fbff 100644
--- a/css/list.css
+++ b/css/list.css
@@ -64,6 +64,7 @@
 .show-zoomed {
     display: inherit;
 }
+
 .info-box {
     font-size: 12px;
     background-color: #696969;
@@ -73,27 +74,28 @@
 }
 
 .date {
-    color: #ccc;
+    color: #fff;
     font-style: italic;
     font-size: 10px;
     text-align: right;
-    padding: 5px 5px 0 0;
+    padding: 5px 20px 0 0;
     height: 15px;
 }
+
 .keyword {
-    padding-top: 5px;
     overflow: hidden;
-    width: 80px;
+    width: 165px;
     text-overflow: ellipsis;
-    padding: 0 0 10px 10px;
-    color: #ccc;
+    padding: 0 10px 10px 10px;
+    color: #fff;
+    white-space: nowrap;
 }
+
 .bottom-button-container {
     text-align: center;
     margin: 10px 0;
 }
 
 .btn-container {
-    flex:1;
-    text-align: right;
+    display:inline-block;
 }
diff --git a/css/style.css b/css/style.css
index d27a7d2..71a9b6c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -14,13 +14,15 @@
     src: url('webfonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
 }
 
-html {
-    height:100%;
+html, body {
+    margin: 0;
+    height: 100%;
 }
 
 button {
     font-family: 'Montserrat', sans-serif;
 }
+
 button:focus {
     outline: none;
 }
@@ -48,14 +50,17 @@ input:focus {
 }
 
 .logo {
-    height: 31px;
-    position: absolute;
-    left: 30px;
+    height: 31px;    
 }
 
 .top {
     background-color: black;
     padding: 20px;
+    display: flex;
+    justify-content: space-between;
+}
+
+.btn-row {
     text-align: right;
 }
 
@@ -68,12 +73,18 @@ input:focus {
     color: white;
     border: none;
     padding: 6px 12px;
-    margin-left: 12px;
+    margin: 6px;
     font-size: 12px;
     cursor: pointer;
     position: relative;
 }
 
+@media (hover: none) and (pointer: coarse) {
+   .btn {
+    font-size: 14px;
+    padding: 10px 16px;
+   } 
+}
 .btn.success {
     background-color: #3BB41B;
 }
@@ -129,18 +140,27 @@ btn.warn:hover {
 
 .filter-text {
     font-size: 14px;
-    padding-right: 20px;
     display: inline-block;
+    color: #626262;
+    font-weight: normal;
+    padding-right: 20px;
+}
+
+.filter-text-label {
+    height:22px;
 }
 
 .filter-box {
-    display: flex;
     border-bottom: solid 1px grey;
     padding: 10px;
     align-items: center;
     line-height: 30px;
 }
 
+.filter-box input {
+    width:150px;
+}
+
 .badge {
     position: absolute;
     right: -10px;
diff --git a/css/webfonts/Lato/Lato-Black.ttf b/css/webfonts/Lato/Lato-Black.ttf
new file mode 100644
index 0000000..4340502
Binary files /dev/null and b/css/webfonts/Lato/Lato-Black.ttf differ
diff --git a/css/webfonts/Lato/Lato-BlackItalic.ttf b/css/webfonts/Lato/Lato-BlackItalic.ttf
new file mode 100644
index 0000000..4df1555
Binary files /dev/null and b/css/webfonts/Lato/Lato-BlackItalic.ttf differ
diff --git a/css/webfonts/Lato/Lato-Bold.ttf b/css/webfonts/Lato/Lato-Bold.ttf
new file mode 100644
index 0000000..016068b
Binary files /dev/null and b/css/webfonts/Lato/Lato-Bold.ttf differ
diff --git a/css/webfonts/Lato/Lato-BoldItalic.ttf b/css/webfonts/Lato/Lato-BoldItalic.ttf
new file mode 100644
index 0000000..a05d503
Binary files /dev/null and b/css/webfonts/Lato/Lato-BoldItalic.ttf differ
diff --git a/css/webfonts/Lato/Lato-Italic.ttf b/css/webfonts/Lato/Lato-Italic.ttf
new file mode 100644
index 0000000..0d0f69e
Binary files /dev/null and b/css/webfonts/Lato/Lato-Italic.ttf differ
diff --git a/css/webfonts/Lato/Lato-Light.ttf b/css/webfonts/Lato/Lato-Light.ttf
new file mode 100644
index 0000000..dfa72ce
Binary files /dev/null and b/css/webfonts/Lato/Lato-Light.ttf differ
diff --git a/css/webfonts/Lato/Lato-LightItalic.ttf b/css/webfonts/Lato/Lato-LightItalic.ttf
new file mode 100644
index 0000000..12f2b6c
Binary files /dev/null and b/css/webfonts/Lato/Lato-LightItalic.ttf differ
diff --git a/css/webfonts/Lato/Lato-Regular.ttf b/css/webfonts/Lato/Lato-Regular.ttf
new file mode 100644
index 0000000..bb2e887
Binary files /dev/null and b/css/webfonts/Lato/Lato-Regular.ttf differ
diff --git a/css/webfonts/Lato/Lato-Thin.ttf b/css/webfonts/Lato/Lato-Thin.ttf
new file mode 100644
index 0000000..ba58da1
Binary files /dev/null and b/css/webfonts/Lato/Lato-Thin.ttf differ
diff --git a/css/webfonts/Lato/Lato-ThinItalic.ttf b/css/webfonts/Lato/Lato-ThinItalic.ttf
new file mode 100644
index 0000000..4d82766
Binary files /dev/null and b/css/webfonts/Lato/Lato-ThinItalic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-Black.ttf b/css/webfonts/Montserrat/Montserrat-Black.ttf
new file mode 100644
index 0000000..7bb6575
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-Black.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-BlackItalic.ttf b/css/webfonts/Montserrat/Montserrat-BlackItalic.ttf
new file mode 100644
index 0000000..172e249
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-BlackItalic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-Bold.ttf b/css/webfonts/Montserrat/Montserrat-Bold.ttf
new file mode 100644
index 0000000..efddc83
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-Bold.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-BoldItalic.ttf b/css/webfonts/Montserrat/Montserrat-BoldItalic.ttf
new file mode 100644
index 0000000..b7d8031
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-BoldItalic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-ExtraBold.ttf b/css/webfonts/Montserrat/Montserrat-ExtraBold.ttf
new file mode 100644
index 0000000..3059507
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-ExtraBold.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-ExtraBoldItalic.ttf b/css/webfonts/Montserrat/Montserrat-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..c21a396
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-ExtraBoldItalic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-ExtraLight.ttf b/css/webfonts/Montserrat/Montserrat-ExtraLight.ttf
new file mode 100644
index 0000000..f1b405e
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-ExtraLight.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-ExtraLightItalic.ttf b/css/webfonts/Montserrat/Montserrat-ExtraLightItalic.ttf
new file mode 100644
index 0000000..382293d
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-ExtraLightItalic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-Italic.ttf b/css/webfonts/Montserrat/Montserrat-Italic.ttf
new file mode 100644
index 0000000..eee45ba
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-Italic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-Light.ttf b/css/webfonts/Montserrat/Montserrat-Light.ttf
new file mode 100644
index 0000000..c5dfdb7
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-Light.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-LightItalic.ttf b/css/webfonts/Montserrat/Montserrat-LightItalic.ttf
new file mode 100644
index 0000000..5bdce7f
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-LightItalic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-Medium.ttf b/css/webfonts/Montserrat/Montserrat-Medium.ttf
new file mode 100644
index 0000000..dfc7e2f
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-Medium.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-MediumItalic.ttf b/css/webfonts/Montserrat/Montserrat-MediumItalic.ttf
new file mode 100644
index 0000000..ce56883
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-MediumItalic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-Regular.ttf b/css/webfonts/Montserrat/Montserrat-Regular.ttf
new file mode 100644
index 0000000..aa9033a
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-Regular.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-SemiBold.ttf b/css/webfonts/Montserrat/Montserrat-SemiBold.ttf
new file mode 100644
index 0000000..cbf44db
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-SemiBold.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-SemiBoldItalic.ttf b/css/webfonts/Montserrat/Montserrat-SemiBoldItalic.ttf
new file mode 100644
index 0000000..7f9153d
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-SemiBoldItalic.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-Thin.ttf b/css/webfonts/Montserrat/Montserrat-Thin.ttf
new file mode 100644
index 0000000..7c90a54
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-Thin.ttf differ
diff --git a/css/webfonts/Montserrat/Montserrat-ThinItalic.ttf b/css/webfonts/Montserrat/Montserrat-ThinItalic.ttf
new file mode 100644
index 0000000..94bcf55
Binary files /dev/null and b/css/webfonts/Montserrat/Montserrat-ThinItalic.ttf differ
diff --git a/js/edit/keywords.tag b/js/edit/keywords.tag
index 5b249b9..06ced6f 100644
--- a/js/edit/keywords.tag
+++ b/js/edit/keywords.tag
@@ -7,6 +7,7 @@
 
         function onData(data){
             that.keywords = data.keywords;
+            console.log('bla',data);
             that.update();
         };
 
diff --git a/js/list/docFilter.tag b/js/list/docFilter.tag
index 2716195..ff2e824 100644
--- a/js/list/docFilter.tag
+++ b/js/list/docFilter.tag
@@ -1,14 +1,24 @@
 <doc-filter>
     <div class="filter-box">
-        <div class="filter-text"><lang-text ref="Date_From"></lang-text>: <input type="date" ref="datefrom" oninput="{onDateFromInput}"></div>
-        <div class="filter-text"><lang-text ref="Date_To"></lang-text>: <input type="date" ref="dateto" oninput="{onDateToInput}"></div>
-        <div class="filter-text"><lang-text ref="Hidden_Keyword"></lang-text>:
+        <div class="filter-text">
+            <div class="filter-text-label"><lang-text ref="Date_From"></lang-text>:</div>         
+            <input type="date" ref="datefrom" oninput="{onDateFromInput}">
+        </div>
+        <div class="filter-text">
+            <div class="filter-text-label"><lang-text ref="Date_To"></lang-text>: </div>        
+            <input type="date" ref="dateto" oninput="{onDateToInput}">
+        </div>
+        <div class="filter-text">
+            <div class="filter-text-label"><lang-text ref="Hidden_Keyword"></lang-text>:</div>
             <input list="listedkeywords" type="text" ref="searchfieldkeyword" onkeydown="{onSearchKeywordKeydown}">
             <datalist id="listedkeywords">
                 <option each={keyword in listedKeywords} value="{keyword}">{keyword}</option>
             </datalist>
         </div>
-        <div class="filter-text"><lang-text ref="Search"></lang-text>: <input type="text" ref="searchfield" onkeydown="{onSearchKeydown}"></div>
+        <div class="filter-text">
+            <div class="filter-text-label"><lang-text ref="Search"></lang-text>: </div>
+            <input type="text" ref="searchfield" onkeydown="{onSearchKeydown}">
+        </div>
         <div class="btn-container">
             <button id="reset_date" click="{onResetClick}" class="btn default">Reset</button>
         </div>
diff --git a/js/navBar.tag b/js/navBar.tag
index e5a32cd..b8c6b53 100644
--- a/js/navBar.tag
+++ b/js/navBar.tag
@@ -1,13 +1,14 @@
 <nav-bar>
     <div class="top">
         <img class="logo" src="images/logo.png" alt="">
-
-        <button onclick="{onNoKeywordClick}" ref="noKeyword" class="btn default {disabled: noTagCount == 0}"><i class="fa fa-fw fa-tag"></i> <lang-text ref="without_keyword"></lang-text> <label class="badge">{noTagCount}</label></button>
-        <button onclick="{onNoDateClick}" ref="noDate" class="btn default {disabled: noDateCount == 0}"><i class="fa fa-fw fa-calendar"></i> <lang-text ref="without_date"></lang-text> <label class="badge">{noDateCount}</label></button>
-        <button onclick="{onUploadClick}" ref="upload" class="btn success"><i class="fa fa-fw fa-upload"></i> <lang-text ref="Upload"></lang-text></button>
-        <button onclick="{onDeleteClick}" ref="delete" class="btn danger"><i class="fa fa-fw fa-trash-alt"></i> <lang-text ref="Delete"></lang-text></button>
-        <button onclick="{onBackClick}" ref="back" class="btn default"><i class="fa fa-fw fa-arrow-left"></i> <lang-text ref="Back"></lang-text></button>
-        <button onclick="{onLogoutClick}" ref="logout" class="btn danger"><i class="fa fa-fw fa-sign-out-alt"></i> <lang-text ref="Logout"></lang-text></button>
+        <div class="btn-row">
+            <button onclick="{onNoKeywordClick}" ref="noKeyword" class="btn default {disabled: noTagCount == 0}"><i class="fa fa-fw fa-tag"></i> <lang-text ref="without_keyword"></lang-text> <label class="badge">{noTagCount}</label></button>
+            <button onclick="{onNoDateClick}" ref="noDate" class="btn default {disabled: noDateCount == 0}"><i class="fa fa-fw fa-calendar"></i> <lang-text ref="without_date"></lang-text> <label class="badge">{noDateCount}</label></button>
+            <button onclick="{onUploadClick}" ref="upload" class="btn success"><i class="fa fa-fw fa-upload"></i> <lang-text ref="Upload"></lang-text></button>
+            <button onclick="{onDeleteClick}" ref="delete" class="btn danger"><i class="fa fa-fw fa-trash-alt"></i> <lang-text ref="Delete"></lang-text></button>
+            <button onclick="{onBackClick}" ref="back" class="btn default"><i class="fa fa-fw fa-arrow-left"></i> <lang-text ref="Back"></lang-text></button>
+            <button onclick="{onLogoutClick}" ref="logout" class="btn danger"><i class="fa fa-fw fa-sign-out-alt"></i> <lang-text ref="Logout"></lang-text></button>
+        </div>
     </div>
     <script>
         const that = this;
diff --git a/js/stores/docDetail.store.js b/js/stores/docDetail.store.js
index 5cdfb87..1aa7392 100644
--- a/js/stores/docDetail.store.js
+++ b/js/stores/docDetail.store.js
@@ -21,7 +21,7 @@ function DocDetailStore(){
                 }
                 else {
                     response.json().then(data =>{
-                        that.doc = data;
+                        that.doc = data;                    
                         that.trigger('docDetails', data);
                     });
                 }