diff --git a/resources/styles/partials/user-settings.scss b/resources/styles/partials/user-settings.scss
index d117cfde2..03be38f3f 100644
--- a/resources/styles/partials/user-settings.scss
+++ b/resources/styles/partials/user-settings.scss
@@ -24,9 +24,9 @@
       }
 
       &.current {
-        background-color: $main-ui-color;
+        background-color: $primary-ui-bg;
         border: 0;
-        color: $color-white;
+        color: $main-ui-color;
       }
 
     }
diff --git a/src/uxbox/ui/settings.cljs b/src/uxbox/ui/settings.cljs
index c2418ad1f..d6eaef5ef 100644
--- a/src/uxbox/ui/settings.cljs
+++ b/src/uxbox/ui/settings.cljs
@@ -64,13 +64,20 @@
   (html
    [:main.dashboard-main
     (header)
-    [:section.dashboard-content
-     [:ul
-      [:li {:on-click #(r/go :settings/profile)} "Profile"]
-      [:li {:on-click #(r/go :settings/password)} "Password"]
-      [:li {:on-click #(r/go :settings/notifications)} "Notifications"]]
-     [:section.dashboard-grid.library
-      [:span "TODO 2"]]]]))
+    [:section.dashboard-content.user-settings
+     [:div.user-settings-nav
+      [:ul.user-settings-nav-inside
+       [:li {:on-click #(r/go :settings/profile)} "Profile"]
+       [:li.current {:on-click #(r/go :settings/password)} "Password"]
+       [:li {:on-click #(r/go :settings/notifications)} "Notifications"]]]
+
+     [:section.user-settings-content
+      [:span.user-settings-label "Change password"]
+      [:input.input-text {:type "password" :placeholder "Old password"}]
+      [:input.input-text {:type "password" :placeholder "New password"}]
+      [:input.input-text {:type "password" :placeholder "Confirm password"}]
+      [:input.btn-primary {:type "submit" :value "Update settings"}]
+     ]]]))
 
 (def ^:static password-page
   (mx/component