diff --git a/app/views/admin/assets/_asset.html.erb b/app/views/admin/assets/_asset.html.erb
index 9eb4e77a..3a8dc439 100644
--- a/app/views/admin/assets/_asset.html.erb
+++ b/app/views/admin/assets/_asset.html.erb
@@ -1,6 +1,6 @@
 <tr id="asset_<%= asset.id %>" class="with_action">
 	<td><%= check_box_tag 'to_delete[]', asset.id, false, :class => "checkbox_in_list" %></td>
-	<td><%= asset.i18n_variable[I18n.locale] rescue nil %></td>
+	<td><%= asset.title.i18n_variable[I18n.locale] rescue nil %></td>
 	<td>
 		<i class="icons-picture img-peview" rel="popover" data-content="<img src='<%= asset.data.url %>' />" data-original-title="<%= asset.data.filename %>"></i>
 		<div class="quick-edit">
@@ -12,7 +12,7 @@
 	</td>
 	<td><%= asset.data.file.content_type %></td>
 	<td><%= number_to_human_size(asset.data.file.file_length) %></td>
-	<td><%= asset.category.i18n_variable[I18n.locale] rescue nil %></td>
+	<td><%= asset.description.i18n_variable[I18n.locale] rescue nil %></td>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
diff --git a/app/views/admin/assets/_sort_headers.html.erb b/app/views/admin/assets/_sort_headers.html.erb
index 86e5f86a..43cb5927 100644
--- a/app/views/admin/assets/_sort_headers.html.erb
+++ b/app/views/admin/assets/_sort_headers.html.erb
@@ -2,5 +2,5 @@
 													['description', 'description', 'span1-2', 'admin.data'],
 													['intro', 'intro', 'span1-2', 'admin.file_type'],
 													['intro', 'intro', 'span1-2', 'admin.file_length'],
-													['intro', 'intro', 'span1-2', 'admin.category'],
+													['intro', 'intro', 'span1-2', 'admin.description'],
 													['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %>
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 53314765..ab5981a8 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -71,11 +71,11 @@
 	<% end -%>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('assets', '/admin/asset_tags', 'asset_categories') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.asset'), admin_assets_path %>
-	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('assets', '/admin/asset_tags', 'asset_categories')) do -%>
-		<%= content_tag :li, link_to(t('admin.all_assets'), admin_assets_path), :class => active_for_action('assets', 'index') %>
-		<%= content_tag :li, link_to(t('admin.categories'), admin_asset_categories_path), :class => active_for_action('asset_categories', 'index') %>
-		<%= content_tag :li, link_to(t('admin.tags'), admin_asset_tags_path), :class => active_for_action('/admin/asset_tags', 'index') %>
-	<% end -%>
-<% end -%>
+<%#= content_tag :li, :class => active_for_controllers('assets', '/admin/asset_tags', 'asset_categories') do -%>
+	<%#= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.asset'), admin_assets_path %>
+	<%#= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('assets', '/admin/asset_tags', 'asset_categories')) do -%>
+		<%#= content_tag :li, link_to(t('admin.all_assets'), admin_assets_path), :class => active_for_action('assets', 'index') %>
+		<%#= content_tag :li, link_to(t('admin.categories'), admin_asset_categories_path), :class => active_for_action('asset_categories', 'index') %>
+		<%#= content_tag :li, link_to(t('admin.tags'), admin_asset_tags_path), :class => active_for_action('/admin/asset_tags', 'index') %>
+	<%# end -%>
+<%# end -%>