diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index fdc9d5fb2..34a01c9a3 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -8,3 +8,4 @@ $case formLayout
           <label .form-group__label .reactive-label for=#{fvId view}>#{fvLabel view}
         $# TODO: inputs should have proper placeholders
         ^{fvInput view}
+        $# FIXME: file-input element  does not have `required` attribute, although set on form-group
diff --git a/templates/widgets/navbar.lucius b/templates/widgets/navbar.lucius
index 1097733f5..e24839261 100644
--- a/templates/widgets/navbar.lucius
+++ b/templates/widgets/navbar.lucius
@@ -21,15 +21,24 @@
   box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
 }
 
-@media (max-width: 999px) {
+@media (max-width: 768px) {
 
   .navbar {
     padding-left: 90px;
   }
 }
 
+@media (max-width: 500px) {
+
+  .navbar {
+    padding-left: 20px;
+  }
+}
+
 .navbar__logo {
   transition: all .2s ease;
+  transform-origin: left;
+  width: 0px;
 
   &::before {
     content: 'UniWorkY';
@@ -43,17 +52,14 @@
 @media (max-width: 768px) {
 
   .navbar__logo {
-    transform: scale(0.7, 0.7);
-    transform-origin: left;
-    position: absolute;
+    transform: scale(0.7);
   }
 }
 
-@media (max-width: 500px) {
+@media (max-width: 425px) {
 
   .navbar__logo {
-    left: 20px;
-    transform: scale(0.3, 0.3);
+    transform: scale(0.3);
   }
 }