diff --git a/app/assets/images/home_back.jpg b/app/assets/images/home_back.jpg
index e3026ee45..e3cbe7b1e 100644
Binary files a/app/assets/images/home_back.jpg and b/app/assets/images/home_back.jpg differ
diff --git a/app/assets/images/home_back_overlay.jpg b/app/assets/images/home_back_overlay.jpg
deleted file mode 100644
index 3a9ac6090..000000000
Binary files a/app/assets/images/home_back_overlay.jpg and /dev/null differ
diff --git a/app/assets/stylesheets/_bootstrap-overrides.scss b/app/assets/stylesheets/_bootstrap-overrides.scss
index e87e79863..209c59064 100644
--- a/app/assets/stylesheets/_bootstrap-overrides.scss
+++ b/app/assets/stylesheets/_bootstrap-overrides.scss
@@ -7,3 +7,7 @@ $navbar-inverse-link-color: $white;
 $navbar-inverse-link-active-color: $palette-light-blue;
 $navbar-inverse-link-active-bg: $palette-turkey;
 $navbar-inverse-link-hover-color: $palette-light-blue;
+$navbar-inverse-toggle-border-color: $white;
+$navbar-inverse-toggle-hover-bg: $palette-dark-turkey;
+
+$navbar-inverse-bg: $palette-turkey;
diff --git a/app/assets/stylesheets/_to-categories-dropdown.scss b/app/assets/stylesheets/_to-categories-dropdown.scss
new file mode 100644
index 000000000..648d224e9
--- /dev/null
+++ b/app/assets/stylesheets/_to-categories-dropdown.scss
@@ -0,0 +1,5 @@
+.to-categories-dropdown {
+  @media(max-width: $screen-sm-min) {
+    display: none;
+  }
+}
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
index e4758a205..3a06a6086 100644
--- a/app/assets/stylesheets/_variables.scss
+++ b/app/assets/stylesheets/_variables.scss
@@ -2,6 +2,8 @@
 $palette-turkey: #2797af;
 $palette-dark-turkey: #165e6d;
 $palette-light-blue: #d9edf7;
+$palette-grey: #aaa;
+$palette-black: #333;
 
 // Old colors
 $bg-color: #f5f8fa;
@@ -14,7 +16,7 @@ $form-input-bg-color: #f5f5f5;
 $form-input-button: #2a292a;
 $form-input-button-hover: #3a393a;
 $form-a-color: gray;
-$form-a-hover-color: #333;
+$form-a-hover-color: $palette-black;
 $form-login-gray-text: #9b9b9b;
 $btn-landing: rgba(255, 255, 255, 0.7);
 $btn-landing-hover: rgba(255, 255, 255, 0.9);
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 59101a9b3..fc80c8350 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -5,6 +5,7 @@
 @import "variables";
 @import "bootstrap-sprockets";
 @import "bootstrap-custom";
+@import "to-categories-dropdown";
 
 html {
   font-size:62.5%;
@@ -25,6 +26,15 @@ html {
   float: left;
 }
 
+.actions-menu {
+  margin-bottom: 16px;
+  padding: 0 15px;
+
+  @media(max-width: $screen-sm-min) {
+    padding: 0;
+  }
+}
+
 .actions-menu > .dropdown > .language b {
   display: inline-block;
   margin-left: 0.7rem;
@@ -32,10 +42,19 @@ html {
 
 .actions-menu > li > a {
   color: #101010;
+  padding: 10px 16px;
+
+  @media(max-width: $screen-sm-min) {
+    padding: 10px;
+  }
 }
 
-.actions-menu > li{
-  margin-right:5px;
+.actions-menu > li {
+  margin-right: 6px;
+
+  @media(max-width: $screen-sm-min) {
+    margin-right: 2px;
+  }
 }
 
 #login-box {
@@ -66,14 +85,6 @@ html {
     transition: background-color 100000s ease-in-out 0s;
   }
 
-  span.input-group-addon {
-    padding: 2rem 2rem 2rem 3rem;
-
-    @media (max-width: $screen-xs-min) {
-      display: none;
-    }
-  }
-
   span.show-password {
     border-radius: 0 0.3rem 0.3rem 0;
     cursor: pointer;
@@ -100,10 +111,6 @@ html {
     text-align: center;
   }
 
-  .panel-body {
-    padding: 0 3rem 0 3rem;
-  }
-
   .panel-footer {
     padding: 2rem 3rem;
 
@@ -136,7 +143,6 @@ html {
     color: $form-input-glyph;
     font-size: 2.24rem;
     letter-spacing: -0.0040rem;
-    padding: 2rem;
   }
 
   .form-control {
@@ -174,7 +180,7 @@ html {
   background-color: $white;
   border: 1px solid $border;
   border-radius: 5px;
-  margin: 10px;
+  margin: 14px 0;
   padding: 5px 20px;
 
   h4 {
@@ -192,6 +198,12 @@ html {
     margin-right: 10px;
   }
 
+  &__datetime {
+    color: $palette-grey;
+    padding: 4px 0 0;
+    font-size: 10px;
+    text-align: right;
+  }
 }
 
 .break-word {
@@ -385,8 +397,13 @@ label[required]::after{
 }
 
 .navbar-form {
-  padding: 0;
+  border: 0;
   background-color: transparent;
+  padding: 0;
+
+  @media(max-width: $screen-sm-min) {
+    padding: 10px 15px;
+  }
 }
 
 form .checkbox input[type="checkbox"] {
@@ -418,7 +435,7 @@ form .checkbox input[type="checkbox"] {
 }
 
 .navbar-static-top {
-  background-color: $palette-turkey;
+  background-color: rgba($palette-turkey, 0.9);
 }
 
 .navbar-inverse {
@@ -432,7 +449,7 @@ form .checkbox input[type="checkbox"] {
 }
 
 .language-selector{
-  margin: 0.5rem 2rem 0 2rem;
+  margin: 0.6rem 2rem 0 2rem;
   width: 13.5rem;
 }
 
@@ -511,18 +528,15 @@ form .checkbox input[type="checkbox"] {
   .back-overlay {
     display: block;
     filter: alpha(opacity = 60); /* For IE8 and earlier */
-    opacity: 0.6;
+    opacity: 0.2;
   }
+
   .vertical-align {
     left: 50%;
     position: absolute;
-    top: 47%;
+    top: 52%;
     transform: translate(-50%, -50%);
-    width: 75%;
-  }
-  .container-fluid {
-    padding-bottom: 0.8rem;
-    padding-top: 0.8rem;
+    width: 82%;
   }
 
   .container-inner {
@@ -559,6 +573,7 @@ form .checkbox input[type="checkbox"] {
     font-weight: 700;
     letter-spacing: -0.073rem;
     margin: 0;
+    text-shadow: 1px 1px $palette-black;
   }
 
   h3 {
@@ -567,6 +582,7 @@ form .checkbox input[type="checkbox"] {
     font-weight: 500;
     letter-spacing: -0.107rem;
     margin-top: 1rem;
+    text-shadow: 1px 1px $palette-black;
   }
 
   .btn {
@@ -589,18 +605,6 @@ form .checkbox input[type="checkbox"] {
 }
 
 .login-page {
-  h1 {
-    font-size: 3.84rem;
-    font-weight: 600;
-    letter-spacing: 0.031rem;
-    margin-bottom: 2rem;
-    margin-top: 3rem;
-
-    @media (max-width: $screen-xs-min) {
-      display: none;
-    }
-  }
-
   .material-icons {
     font-size: 3rem;
   }
@@ -646,10 +650,6 @@ form .checkbox input[type="checkbox"] {
     padding: 0;
   }
 
-  #login-box .panel-body {
-    padding: 3rem 3rem 2rem 3rem;
-  }
-
   .panel-body h2 {
     font-size: 1.9rem;
     font-weight: 500;
@@ -750,7 +750,7 @@ form .checkbox input[type="checkbox"] {
   }
 
   .banner {
-    background: image-url('home_back_overlay.jpg') no-repeat center center;
+    background: image-url('home_back.jpg') no-repeat center center;
     background-size: cover;
     margin: 8rem 0 3rem 0;
     padding: 8rem 1rem;
diff --git a/app/views/application/_navbar.html.erb b/app/views/application/_navbar.html.erb
index 27f7d759d..3e7d13238 100644
--- a/app/views/application/_navbar.html.erb
+++ b/app/views/application/_navbar.html.erb
@@ -43,22 +43,20 @@
 
 <% if current_user && current_organization %>
 <nav role="navigation">
-  <div class="container-fluid">
-    <div class="container">
-      <div class="row">
-        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-          <ul class="nav nav-pills actions-menu">
-              <%= render 'application/menus/user_list_link' %>
-              <%= render 'application/menus/offers_dashboard_link' %>
-              <%= render 'application/menus/inquiries_list_link' %>
-              <% if current_user.manages? current_organization %>
-                <%= render 'application/menus/offers_by_tag_link' %>
-                <%= render 'application/menus/organization_reports_menu' %>
-                <%= render 'application/menus/organization_statistics_menu' %>
-                <%= render 'application/menus/organization_listings_menu' %>
-              <% end %>
-          </ul>
-        </div>
+  <div class="container">
+    <div class="row">
+      <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+        <ul class="nav nav-pills actions-menu">
+          <%= render 'application/menus/user_list_link' %>
+          <%= render 'application/menus/offers_dashboard_link' %>
+          <%= render 'application/menus/inquiries_list_link' %>
+          <% if current_user.manages? current_organization %>
+            <%= render 'application/menus/offers_by_tag_link' %>
+            <%= render 'application/menus/organization_reports_menu' %>
+            <%= render 'application/menus/organization_statistics_menu' %>
+            <%= render 'application/menus/organization_listings_menu' %>
+          <% end %>
+        </ul>
       </div>
     </div>
   </div>
diff --git a/app/views/application/menus/_user_list_link.html.erb b/app/views/application/menus/_user_list_link.html.erb
index e3bf2c45e..1b27a7da3 100644
--- a/app/views/application/menus/_user_list_link.html.erb
+++ b/app/views/application/menus/_user_list_link.html.erb
@@ -1,6 +1,6 @@
 <li class="<%= "active" if current_page?(users_path) %>">
   <%= link_to users_path do %>
     <%= glyph :user %>
-    <%= User.model_name.human(count: :many) %>
+    <%= t("users.index.members") %>
   <% end %>
 </li>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 53da0b629..051e353bf 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,11 +1,6 @@
 <div class="vertical-align">
   <div class="col-xs-12 col-sm-8 col-md-6 col-lg-6 col-sm-offset-2 col-md-offset-3 col-lg-offset-3">
     <div class="panel" id="login-box">
-      <div class="panel-heading">
-        <h1>
-          TimeOverflow
-        </h1>
-      </div>
       <div class="panel-body">
         <%= render 'layouts/messages' %>
         <%= show_error_messages!(resource) %>
diff --git a/app/views/inquiries/index.html.erb b/app/views/inquiries/index.html.erb
index a5671a86c..3dabc4c83 100644
--- a/app/views/inquiries/index.html.erb
+++ b/app/views/inquiries/index.html.erb
@@ -1,57 +1,77 @@
 <% @category = Category.where(id: params[:cat]).first %>
-<h1>
-  <%= Inquiry.model_name.human(count: :many) %>
-  <%= render "shared/show_filter_hint" %>
-</h1>
 
-<div class="navbar">
-  <form action="<%= inquiries_path %>"
-        class="navbar-form navbar-left"
-        method="get"
-        role="search">
-    <div class="form-group">
-      <input class="form-control"
-             name="q"
-             placeholder="<%= t("global.search") %>"
-             type="text"
-             value="<%= params[:q] %>">
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <h1>
+        <%= Inquiry.model_name.human(count: :many) %>
+        <%= render "shared/show_filter_hint" %>
+      </h1>
     </div>
-    <button class="btn btn-default" type="submit">
-      <%= t("global.search") %>
-    </button>
-  </form>
-  <ul class="nav navbar-nav">
-    <li class="dropdown">
-      <a class="dropdown-toggle" href="#" data-toggle="dropdown">
-        <%= @category ? @category.name : Category.model_name.human %>
-        <span class="caret"></span>
-      </a>
-      <ul class="dropdown-menu" role="menu">
-        <li>
-          <%= link_to "× #{t("global.all")}", inquiries_path %>
+  </div>
+</div>
+
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-8">
+      <form action="<%= inquiries_path %>"
+            class="navbar-form navbar-left"
+            method="get"
+            role="search">
+        <div class="form-group">
+          <input class="form-control"
+                 name="q"
+                 placeholder="<%= t("global.search") %>"
+                 type="text"
+                 value="<%= params[:q] %>">
+        </div>
+        <button class="btn btn-default" type="submit">
+          <%= t("global.search") %>
+        </button>
+      </form>
+
+      <ul class="to-categories-dropdown nav navbar-nav">
+        <li class="dropdown">
+          <a class="dropdown-toggle" href="#" data-toggle="dropdown">
+            <%= @category ? @category.name : Category.model_name.human %>
+            <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu" role="menu">
+            <li>
+              <%= link_to "× #{t("global.all")}", inquiries_path %>
+            </li>
+            <% Category.all.sort_by { |a| a.name.downcase }.each do |c| %>
+              <% next if c == @category %>
+              <li>
+                <%= link_to c.name, inquiries_path(cat: c.id) %>
+              </li>
+            <% end %>
+          </ul>
         </li>
-        <% Category.all.sort_by { |a| a.name.downcase }.each do |c| %>
-          <% next if c == @category %>
+      </ul>
+    </div>
+
+    <div class="col-md-4">
+      <% if current_user && current_organization && !params[:org] %>
+        <ul class="nav navbar-nav pull-right">
           <li>
-            <%= link_to c.name, inquiries_path(cat: c.id) %>
+            <%= link_to new_inquiry_path do %>
+              <%= glyph :plus %>
+              <%= t "helpers.submit.create", model: Inquiry.model_name.human %>
+            <% end %>
           </li>
-        <% end %>
-      </ul>
-    </li>
-  </ul>
-  <% if current_user && current_organization && !params[:org] %>
-    <ul class="nav navbar-nav pull-right">
-      <li>
-        <%= link_to new_inquiry_path do %>
-          <%= glyph :plus %>
-          <%= t "helpers.submit.create", model: Inquiry.model_name.human %>
-        <% end %>
-      </li>
-    </ul>
-  <% end %>
+        </ul>
+      <% end %>
+    </div>
+  </div>
 </div>
 
-<div class="inquiries">
-  <%= render "shared/posts", posts: @inquiries %>
+<div class="container-fluid inquiries">
+  <div class="row">
+    <div class="col-md-12">
+      <%= render "shared/posts", posts: @inquiries %>
+    </div>
+  </div>
 </div>
+
 <%= paginate @inquiries %>
diff --git a/app/views/offers/dashboard.html.erb b/app/views/offers/dashboard.html.erb
index c3fd497e6..c142cc43a 100644
--- a/app/views/offers/dashboard.html.erb
+++ b/app/views/offers/dashboard.html.erb
@@ -1,59 +1,78 @@
-<h1>
-  <%= Offer.model_name.human(count: :many) %>
-  <%= render "shared/show_filter_hint" %>
-</h1>
-<div class="navbar">
-  <form action="<%= offers_path %>"
-        class="navbar-form navbar-left"
-        method="get"
-        role="search">
-    <div class="form-group">
-      <input class="form-control"
-             name="q"
-             placeholder="<%= t "global.search" %>"
-             type="text"
-             value="<%= params[:q] %>">
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <h1>
+        <%= Offer.model_name.human(count: :many) %>
+        <%= render "shared/show_filter_hint" %>
+      </h1>
     </div>
-    <button class="btn btn-default" type="submit">
-      <%= t("global.search") %>
-    </button>
-  </form>
-  <ul class="nav navbar-nav">
-    <li class="dropdown">
-      <a class="dropdown-toggle" href="#" data-toggle="dropdown">
-        <%= @category ? @category.name : Category.model_name.human %>
-        <span class="caret"></span>
-      </a>
-      <ul class="dropdown-menu" role="menu">
+  </div>
+</div>
+
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-8">
+      <form action="<%= offers_path %>"
+            class="navbar-form navbar-left"
+            method="get"
+            role="search">
+        <div class="form-group">
+          <input class="form-control"
+                 name="q"
+                 placeholder="<%= t "global.search" %>"
+                 type="text"
+                 value="<%= params[:q] %>">
+        </div>
+        <button class="btn btn-default" type="submit">
+          <%= t("global.search") %>
+        </button>
+      </form>
+      <ul class="to-categories-dropdown nav navbar-nav">
+        <li class="dropdown">
+          <a class="dropdown-toggle" href="#" data-toggle="dropdown">
+            <%= @category ? @category.name : Category.model_name.human %>
+            <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu" role="menu">
+            <li>
+              <%= link_to "× #{t "global.all"}", offers_path %>
+            </li>
+            <% Category.all.sort_by { |a| a.name.downcase }.each do |c| %>
+              <% next if c == @category %>
+              <li>
+                <%= link_to c.name, offers_path(cat: c.id) %>
+              </li>
+            <% end %>
+          </ul>
+        </li>
+      </ul>
+    </div>
+
+    <div class="col-md-4">
+      <ul class="nav navbar-nav pull-right">
         <li>
-          <%= link_to "× #{t "global.all"}", offers_path %>
+          <%= link_to new_offer_path do %>
+            <%= glyph :plus %>
+            <%= t "helpers.submit.create", model: Offer.model_name.human %>
+          <% end %>
         </li>
-        <% Category.all.sort_by { |a| a.name.downcase }.each do |c| %>
-          <% next if c == @category %>
-          <li>
-            <%= link_to c.name, offers_path(cat: c.id) %>
-          </li>
-        <% end %>
       </ul>
-    </li>
-  </ul>
-  <ul class="nav navbar-nav pull-right">
-    <li>
-      <%= link_to new_offer_path do %>
-        <%= glyph :plus %>
-        <%= t "helpers.submit.create", model: Offer.model_name.human %>
-      <% end %>
-    </li>
-  </ul>
+    </div>
+  </div>
 </div>
-<% @offers.each do |cat, offs| %>
-  <div class="offers">
-    <h3>
-      <%= cat.name.capitalize %>
-    </h3>
-    <%= render 'shared/posts', posts: offs %>
+
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <% @offers.each do |cat, offs| %>
+        <div class="offers">
+          <h3><%= cat.name.capitalize %></h3>
+          <%= render 'shared/posts', posts: offs %>
+        </div>
+        <%= link_to offers_path(cat: cat.id), class: "more btn btn-primary" do %>
+          <%= t('global.more') %>
+        <% end %>
+      <% end %>
+    </div>
   </div>
-  <%= link_to offers_path(cat: cat.id), class: "more btn btn-primary" do %>
-    <%= t('global.more') %>
-  <% end %>
-<% end %>
+</div>
diff --git a/app/views/offers/index.html.erb b/app/views/offers/index.html.erb
index 09acc9d12..f72851530 100644
--- a/app/views/offers/index.html.erb
+++ b/app/views/offers/index.html.erb
@@ -1,55 +1,76 @@
-<h1>
-  <% @category = Category.where(id: params[:cat]).first %>
-  <%= Offer.model_name.human(count: :many) %>
-  <%= render "shared/show_filter_hint" %>
-</h1>
-<div class="navbar">
-  <form action="<%= offers_path %>"
-        class="navbar-form navbar-left"
-        method="get"
-        role="search">
-    <div class="form-group">
-      <input class="form-control"
-             name="q"
-             placeholder="<%= t 'global.search' %>"
-             type="text"
-             value="<%= params[:q] %>">
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <h1>
+        <% @category = Category.where(id: params[:cat]).first %>
+        <%= Offer.model_name.human(count: :many) %>
+        <%= render "shared/show_filter_hint" %>
+      </h1>
     </div>
-    <button class="btn btn-default" type="submit">
-      <%= t 'global.search' %>
-    </button>
-  </form>
-  <ul class="nav navbar-nav">
-    <li class="dropdown">
-      <a class="dropdown-toggle" href="#" data-toggle="dropdown">
-        <%= @category ? @category.name : Category.model_name.human %>
-        <span class="caret"></span>
-      </a>
-      <ul class="dropdown-menu" role="menu">
-        <li>
-          <%= link_to "× #{t 'global.all'}", dashboard_offers_path %>
+  </div>
+</div>
+
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-8">
+      <form action="<%= offers_path %>"
+            class="navbar-form navbar-left"
+            method="get"
+            role="search">
+        <div class="form-group">
+          <input class="form-control"
+                 name="q"
+                 placeholder="<%= t 'global.search' %>"
+                 type="text"
+                 value="<%= params[:q] %>">
+        </div>
+        <button class="btn btn-default" type="submit">
+          <%= t 'global.search' %>
+        </button>
+      </form>
+
+      <ul class="to-categories-dropdown nav navbar-nav">
+        <li class="dropdown">
+          <a class="dropdown-toggle" href="#" data-toggle="dropdown">
+            <%= @category ? @category.name : Category.model_name.human %>
+            <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu" role="menu">
+            <li>
+              <%= link_to "× #{t 'global.all'}", dashboard_offers_path %>
+            </li>
+            <% Category.all.sort_by { |a| a.name.downcase }.each do |c| %>
+              <% next if c == @category %>
+              <li>
+                <%= link_to c.name, offers_path(cat: c.id) %>
+              </li>
+            <% end %>
+          </ul>
         </li>
-        <% Category.all.sort_by { |a| a.name.downcase }.each do |c| %>
-          <% next if c == @category %>
+      </ul>
+    </div>
+
+    <div class="col-md-4">
+      <% if current_user && current_organization && !params[:org] %>
+        <ul class="nav navbar-nav pull-right">
           <li>
-            <%= link_to c.name, offers_path(cat: c.id) %>
+            <%= link_to new_offer_path do %>
+              <%= glyph :plus %>
+              <%= t "helpers.submit.create", model: Offer.model_name.human %>
+            <% end %>
           </li>
-        <% end %>
-      </ul>
-    </li>
-  </ul>
-  <% if current_user && current_organization && !params[:org] %>
-    <ul class="nav navbar-nav pull-right">
-      <li>
-        <%= link_to new_offer_path do %>
-          <%= glyph :plus %>
-          <%= t "helpers.submit.create", model: Offer.model_name.human %>
-        <% end %>
-      </li>
-    </ul>
-  <% end %>
+        </ul>
+      <% end %>
+    </div>
+  </div>
 </div>
-<div class="offers">
-  <%= render "shared/posts", posts: @offers %>
+
+<div class="container-fluid offers">
+  <div class="row">
+    <div class="col-md-12">
+      <%= render "shared/posts", posts: @offers %>
+    </div>
+  </div>
 </div>
+
 <%= paginate @offers %>
diff --git a/app/views/shared/_posts.html.erb b/app/views/shared/_posts.html.erb
index 6c1633273..44ad8fd04 100644
--- a/app/views/shared/_posts.html.erb
+++ b/app/views/shared/_posts.html.erb
@@ -18,12 +18,13 @@
           <%= glyph :tag %>
           <%= link_to tag, get_index_path(post,tag: tag) %>
         <% end %>
-        <% if post.type == "Inquiry" %>
-          <span class="pull-right">
-            <%= l post.updated_at.to_date, format: :long %>
-          </span>
-        <% end %>
       </small>
     </p>
+
+    <% if post.type == "Inquiry" %>
+      <div class="post__datetime">
+        <%= l post.updated_at.to_date, format: :long %>
+      </div>
+    <% end %>
   </div>
 <% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 11b4bc2e5..0b2ec3aeb 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,63 +1,81 @@
-<div>
-  <h1>
-    <%= User.model_name.human.pluralize %>
-    —
-    <%= link_to current_organization.name,
-                organization_path(current_organization) %>
-  </h1>
-  <div class="navbar">
-    <%= search_form_for(@search, class: "navbar-form navbar-left", url: users_path) do |f| %>
-      <%= f.search_field :user_username_or_user_email_contains, class: "form-control" %>
-      <button class="btn btn-default" type="submit">
-        <%= t 'global.search' %>
-      </button>
-    <% end %>
-    <ul class="nav navbar-nav pull-right">
-      <% if admin? %>
-        <li>
-          <a href="<%= new_user_path %>">
-            <span class="glyphicon glyphicon-plus"></span>
-            <%= t "helpers.submit.create", model: User.model_name.human %>
-          </a>
-        </li>
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <h1><%= t(".members") %></h1>
+    </div>
+  </div>
+</div>
+
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <%= search_form_for(@search, class: "navbar-form navbar-left", url: users_path) do |f| %>
+        <div class="form-group">
+          <%= f.search_field :user_username_or_user_email_contains, class: "form-control" %>
+        </div>
+        <button class="btn btn-default" type="submit">
+          <%= t 'global.search' %>
+        </button>
       <% end %>
-    </ul>
+      <ul class="nav navbar-nav pull-right">
+        <% if admin? %>
+          <li>
+            <a href="<%= new_user_path %>">
+              <span class="glyphicon glyphicon-plus"></span>
+              <%= t "helpers.submit.create", model: User.model_name.human %>
+            </a>
+          </li>
+        <% end %>
+      </ul>
+    </div>
   </div>
-  <div class="table-responsive">
-    <table class="table table-hover table-condensed users panel">
-      <thead>
-        <tr></tr>
-        <tr>
-          <th></th>
-          <th>ID</th>
-          <th>
-            <%= sort_link @search, :user_username, User.human_attribute_name(:username) %>
-          </th>
-          <th>
-            <%= sort_link @search, :user_email, User.human_attribute_name(:email) %>
-          </th>
-          <th>
-            <%= User.human_attribute_name(:phone) %>
-          </th>
-          <th>
-            <%= User.human_attribute_name(:alt_phone) %>
-          </th>
-          <th>
-            <%= sort_link @search, 'account_balance', Account.human_attribute_name(:balance) %>
-          </th>
-          <% if current_user.manages? current_organization %>
-            <th>
-              <span class="glyphicon glyphicon-hand-down"></span>
-              <%= t(".actions") %>
-            </th>
-          <% end %>
-        </tr>
-      </thead>
-      <tbody>
-        <%= render "user_rows", members: @member_view_models %>
-      </tbody>
-    </table>
+</div>
+
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <h2>
+        <%= link_to current_organization.name,
+                    organization_path(current_organization) %>
+      </h2>
+
+      <div class="table-responsive">
+        <table class="table table-hover table-condensed users panel">
+          <thead>
+            <tr></tr>
+            <tr>
+              <th></th>
+              <th>ID</th>
+              <th>
+                <%= sort_link @search, :user_username, User.human_attribute_name(:username) %>
+              </th>
+              <th>
+                <%= sort_link @search, :user_email, User.human_attribute_name(:email) %>
+              </th>
+              <th>
+                <%= User.human_attribute_name(:phone) %>
+              </th>
+              <th>
+                <%= User.human_attribute_name(:alt_phone) %>
+              </th>
+              <th>
+                <%= sort_link @search, 'account_balance', Account.human_attribute_name(:balance) %>
+              </th>
+              <% if current_user.manages? current_organization %>
+                <th>
+                  <span class="glyphicon glyphicon-hand-down"></span>
+                  <%= t(".actions") %>
+                </th>
+              <% end %>
+            </tr>
+          </thead>
+          <tbody>
+            <%= render "user_rows", members: @member_view_models %>
+          </tbody>
+        </table>
 
-    <%= paginate @members %>
+        <%= paginate @members %>
+      </div>
+    </div>
   </div>
 </div>
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 5f2bf5e9e..9e5d3c391 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -499,6 +499,7 @@ ca:
     give_time:
       give_time: Donar Temps a
     index:
+      members: Membres
       actions: Accions
       active_warning: Estàs a punt de canviar l'estat de l'usuari %{username}
       active_warning_angular: Vas a canviar l'estat del compte de l'usuari {{username}}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 64aad56cc..f3badbe63 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -499,6 +499,7 @@ en:
     give_time:
       give_time: Give time to
     index:
+      members: Members
       actions: Actions
       active_warning: You are going to change user account status for %{username}
       active_warning_angular: You are going to change user account status for {{username}}
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ef62fa833..fac42d8d5 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -499,6 +499,7 @@ es:
     give_time:
       give_time: Dar Tiempo a
     index:
+      members: Miembros
       actions: Acciones
       active_warning: Estás a punto de cambiar el estado del usuario %{username}
       active_warning_angular: Va a cambiar el estado de la cuenta del usuario {{username}}