diff --git a/app/views/ps_admin/product/partials/_basic_information.html.erb b/app/views/ps_admin/product/partials/_basic_information.html.erb
new file mode 100644
index 0000000..96e846e
--- /dev/null
+++ b/app/views/ps_admin/product/partials/_basic_information.html.erb
@@ -0,0 +1,42 @@
+<div class="row">
+  <div class="col-md-3">
+    <div class="info-box" style="border: 1px solid rgba(0,0,0,0.2);">
+      <span class="info-box-icon bg-aqua">
+        <i class="fa fa-money"></i>
+      </span>
+      <div class="info-box-content">
+        <span class="info-box-text">Cena</span>
+        <span class="info-box-number">
+          <a href="#" class="xedit" data-type="text" data-pk="<%= @product.id %>" data-name="price" data-url="/ps_admin/product/xedit" data-title="Cena"><%= '%.2f' % @product.price %></a>
+        </span>
+      </div>
+    </div>
+  </div>
+  <div class="col-md-3">
+    <div class="info-box" style="border: 1px solid rgba(0,0,0,0.2);">
+      <span class="info-box-icon bg-yellow">
+        <i class="fa fa-building"></i>
+      </span>
+      <div class="info-box-content">
+        <span class="info-box-text">Ilość</span>
+        <span class="info-box-number">
+          <a href="#" class="xedit" data-type="text" data-pk="<%= @product.id %>" data-name="qty" data-url="/ps_admin/product/xedit" data-title="Ilość"><%= @product.quantity %></a>
+        </span>
+      </div>
+    </div>
+  </div>
+  <div class="col-md-3" id="product_show_active">
+    <%= render '/ps_admin/product/partials/set_active' %>
+  </div>
+  <div class="col-md-3" id="product_show_quantity">
+    <%= render '/ps_admin/product/partials/set_chk_quantity' %>
+  </div>
+</div>
+<div class="row">
+  <div class="col-md-6" id="product_show_images">
+    <%= render '/ps_admin/image/partials/images' %>
+  </div>
+  <div class="col-md-6" id="product_show_images_form">
+    <%= render '/ps_admin/image/partials/form' %>
+  </div>
+</div>
diff --git a/app/views/ps_admin/product/partials/_categories.html.erb b/app/views/ps_admin/product/partials/_categories.html.erb
new file mode 100644
index 0000000..1fe2d44
--- /dev/null
+++ b/app/views/ps_admin/product/partials/_categories.html.erb
@@ -0,0 +1,31 @@
+<div class="row">
+  <div class="col-md-6">
+    <table class="table table-bordered">
+      <thead>
+        <tr><th>Kategoria</th><th><%= link_to raw('<i class="fa fa-plus"></i> Dodaj'), '#', class: "btn btn-success btn-xs" %></th></tr>
+      </thead>
+      <tbody>
+        <% @product.categories.each do |cat| %>
+          <tr>
+            <td>
+              <% if cat.id == @product.default_category_id %>
+                <strong>
+              <% end %>
+              <% cat.ancestors.reverse!.each do |c| %>
+                <%= c.name %> >
+              <% end %>
+              <%= cat.name %>
+              <% if cat.id == @product.default_category_id %>
+            </strong>
+              <% end %>
+            </td>
+            <td>
+              <%= link_to raw('<i class="fa fa-trash"></i> Usuń'), {controller: '/ps_admin/product', action: 'destroy', id: @product.id, category_id: cat.id},
+                class: "btn btn-danger btn-xs", method: :delete, data: { confirm: cat.id == @product.default_category_id ? "Czy na pewno usunąć produkt?\nUWAGA: Ta operacja usunie produkt ze wszystkich kategorii" : "Czy napewno usunąć produkt z tej kategorii?" }, remote: true %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/app/views/ps_admin/product/partials/_show.html.erb b/app/views/ps_admin/product/partials/_show.html.erb
index 921d2d7..35613c2 100644
--- a/app/views/ps_admin/product/partials/_show.html.erb
+++ b/app/views/ps_admin/product/partials/_show.html.erb
@@ -5,47 +5,19 @@
         <h3 class="box-title"><%= @product.name %></h3>
       </div>
       <div class="box-body">
-        <div class="row">
-          <div class="col-md-3">
-            <div class="info-box" style="border: 1px solid rgba(0,0,0,0.2);">
-              <span class="info-box-icon bg-aqua">
-                <i class="fa fa-money"></i>
-              </span>
-              <div class="info-box-content">
-                <span class="info-box-text">Cena</span>
-                <span class="info-box-number">
-                  <a href="#" class="xedit" data-type="text" data-pk="<%= @product.id %>" data-name="price" data-url="/ps_admin/product/xedit" data-title="Cena"><%= '%.2f' % @product.price %></a>
-                </span>
-              </div>
+        <div class="nav-tabs-custom">
+          <ul class="nav nav-tabs">
+            <li class="active"><a href="#dane_podst_tab" data-toggle="tab">Dane podstawowe</a></li>
+            <li><a href="#kategorie_tab" data-toggle="tab">Kategorie</a></li>
+          </ul>
+          <div class="tab-content">
+            <div class="tab-pane active" id="dane_podst_tab">
+              <%= render '/ps_admin/product/partials/basic_information' %>
             </div>
-          </div>
-          <div class="col-md-3">
-            <div class="info-box" style="border: 1px solid rgba(0,0,0,0.2);">
-              <span class="info-box-icon bg-yellow">
-                <i class="fa fa-building"></i>
-              </span>
-              <div class="info-box-content">
-                <span class="info-box-text">Ilość</span>
-                <span class="info-box-number">
-                  <a href="#" class="xedit" data-type="text" data-pk="<%= @product.id %>" data-name="qty" data-url="/ps_admin/product/xedit" data-title="Ilość"><%= @product.quantity %></a>
-                </span>
-              </div>
+            <div class="tab-pane" id="kategorie_tab">
+              <%= render '/ps_admin/product/partials/categories' %>
             </div>
           </div>
-          <div class="col-md-3" id="product_show_active">
-            <%= render '/ps_admin/product/partials/set_active' %>
-          </div>
-          <div class="col-md-3" id="product_show_quantity">
-            <%= render '/ps_admin/product/partials/set_chk_quantity' %>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-md-6" id="product_show_images">
-            <%= render '/ps_admin/image/partials/images' %>
-          </div>
-          <div class="col-md-6" id="product_show_images_form">
-            <%= render '/ps_admin/image/partials/form' %>
-          </div>
         </div>
       </div>
       <div class="box-footer">
@@ -58,7 +30,7 @@
 <%= javascript_include_tag 'bootstrap-editable' %>
 <script>
   $.fn.editable.defaults.mode = 'popup';
-  $(document).ready(function () { 
+  $(document).ready(function () {
     $('.xedit').editable({
       success: function (response, newValue) {
         if (!response.success)