diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 16b5b53..0b39fd8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,10 +2,10 @@ module ApplicationHelper
 
   def menu_builder
     ret = start_menu
-    ret += menu_element('Strona głowna', '/', "fa fa-dashboard fa-fw")
-    ret += menu_level_open('Konfiguracja', "fa fa-wrench fa-fw")
-    ret += menu_element('Grupy produktow', '/product_groups', '')
-    ret += menu_element('Produkty', '/products', '')
+    ret += menu_element('Strona głowna', '/', "fa fa-dashboard fa-fw", 'welcome')
+    ret += menu_level_open('Konfiguracja', "fa fa-wrench fa-fw", ['product_groups','products'])
+      ret += menu_element('Grupy produktow', '/product_groups', '', 'product_groups')
+      ret += menu_element('Produkty', '/products', '', 'products')
     ret += menu_level_close
     ret += close_menu
     return raw(ret)
@@ -15,20 +15,25 @@ module ApplicationHelper
     '<div class="navbar-default sidebar" role="navigation"><div class="sidebar-nav navbar-collapse"><ul class="nav" id="side-menu">'
   end
 
-  def menu_level_open(text,icon_class)
-    ret = '<li><a href="#">'
-    ret += '<i class="fa fa-bar-chart-o fa-fw"></i>' unless icon_class.blank?
+  def menu_level_open(text,icon_class, controllers)
+    if controllers.include?(controller_name)
+      ret = '<li><a href="#" class="active">'
+    else
+      ret = '<li><a href="#">'
+    end
+
+    ret += '<i class="fa fa-wrench fa-fw"></i>' unless icon_class.blank?
     ret += text
     ret += '<span class="fa arrow"></span></a><ul class="nav nav-second-level">'
     ret
   end
 
-  def menu_element(text, href, icon)
+  def menu_element(text, href, icon, cntr_name)
     ret = '<li>'
-    if false
-      cl = ''
-    else
+    if cntr_name == controller_name
       cl = ' class="active"'
+    else
+      cl = ''
     end
     ret += '<a href="' + href + '"' + cl + '>' + text + '</a>'
     ret += '</li>'
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ce9f668..57f55b9 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,51 +18,11 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.html">SB Admin v2.0</a>
+          <a class="navbar-brand" href="index.html">Diet Help Admin</a>
       </div>
       <!-- /.navbar-header -->
+      <%= raw menu_builder %>
 
-      <div class="navbar-default sidebar" role="navigation">
-          <div class="sidebar-nav navbar-collapse">
-              <ul class="nav" id="side-menu">
-                  <li>
-                      <a href="index.html" class="active"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
-                  </li>
-                  <li>
-                      <a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> Charts<span class="fa arrow"></span></a>
-                      <ul class="nav nav-second-level">
-                          <li>
-                              <a href="flot.html">Flot Charts</a>
-                          </li>
-                          <li>
-                              <a href="morris.html">Morris.js Charts</a>
-                          </li>
-                      </ul>
-                      <!-- /.nav-second-level -->
-                  </li>
-                  <li>
-                      <a href="tables.html"><i class="fa fa-table fa-fw"></i> Tables</a>
-                  </li>
-                  <li>
-                      <a href="forms.html"><i class="fa fa-edit fa-fw"></i> Forms</a>
-                  </li>
-                  <li>
-                      <a href="#"><i class="fa fa-wrench fa-fw"></i> Konfiguracja<span class="fa arrow"></span></a>
-                      <ul class="nav nav-second-level">
-                          <li>
-                              <a href="/product_groups">Grupy produktow</a>
-                          </li>
-                          <li>
-                              <a href="/products">Produkty</a>
-                          </li>
-                      </ul>
-                      <!-- /.nav-second-level -->
-                  </li>
-              </ul>
-          </div>
-          <!-- /.sidebar-collapse -->
-      </div>
-      <!-- /.navbar-static-side -->
   </nav>
 </div>
 <div id="page-wrapper">
diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb
index 75fe95a..b69818a 100644
--- a/app/views/products/index.html.erb
+++ b/app/views/products/index.html.erb
@@ -1,33 +1,49 @@
-<p id="notice"><%= notice %></p>
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header">Produkty</h1>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+<div class="row">
+    <div class="col-lg-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                Listing Products (<%= link_to 'New Product', new_product_path %>)
+            </div>
+            <!-- /.panel-heading -->
+            <div class="panel-body">
+                <div class="dataTable_wrapper">
+                  <p id="notice"><%= notice %></p>
+                    <table class="table table-striped table-bordered table-hover" id="dataTables-example">
+                        <thead>
+                            <tr>
+                              <th>Name</th>
+                              <th>Product group</th>
+                              <th>Kcal</th>
+                              <th>Measure</th>
+                              <th colspan="3"></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                          <% @products.each do |product| %>
+                            <tr>
+                              <td><%= product.name %></td>
+                              <td><%= product.product_group.name %></td>
+                              <td><%= product.kcal %></td>
+                              <td><%= product.measure %></td>
+                              <td><%= link_to raw('<i class="fa fa-eye"></i> Pokaz'), product, :class => "btn btn-success btn-xs" %></td>
+                              <td><%= link_to raw('<i class="fa fa-edit"></i> Edytuj'), edit_product_path(product), :class => "btn btn-info btn-xs" %></td>
+                              <td><%= link_to raw('<i class="fa fa-trash-o"></i> Usuń'), product, method: :delete, data: { confirm: 'Are you sure?' }, :class => "btn btn-danger btn-xs" %></td>
+                            </tr>
+                          <% end %>
+                        </tbody>
+                    </table>
+                </div>
 
-<h1>Listing Products</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Product group</th>
-      <th>Kcal</th>
-      <th>Measure</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @products.each do |product| %>
-      <tr>
-        <td><%= product.name %></td>
-        <td><%= product.product_group.name %></td>
-        <td><%= product.kcal %></td>
-        <td><%= product.measure %></td>
-        <td><%= link_to 'Show', product %></td>
-        <td><%= link_to 'Edit', edit_product_path(product) %></td>
-        <td><%= link_to 'Destroy', product, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Product', new_product_path %>
+            </div>
+            <!-- /.panel-body -->
+        </div>
+        <!-- /.panel -->
+    </div>
+    <!-- /.col-lg-12 -->
+</div>