diff --git a/app/views/admin/universal_tables/show.html.erb b/app/views/admin/universal_tables/show.html.erb
index 08352c9..2f6d084 100644
--- a/app/views/admin/universal_tables/show.html.erb
+++ b/app/views/admin/universal_tables/show.html.erb
@@ -27,32 +27,35 @@
       </tr>
     </thead>
     <tbody>
-    <% can_edit = can_edit_or_delete?(@entries.first.u_table) if !(@entries.first.nil?) %> 
+    <% can_edit = can_edit_or_delete?(@table) %> 
     <% @entries.each do |entry| %>
       <tr>
       <% @columns.each_with_index do |column, index| %>
-      <% ce = entry.column_entries.where(:table_column_id => column.id).first rescue nil %>
-      <% if !ce.nil? %>
+        <% ce = entry.column_entries.where(:table_column_id => column.id).first rescue nil %>
         <td>
-          <% case ce.type %>
-          <% when "text" %>
-            <%= ce.text %>
-          <% when "integer" %>
-            <%= ce.number %>
-          <% when "editor" %>
-            <%= ce.content.html_safe rescue "" %>
-          <% when "image" %>
-            <div class="image-expander">
-              <% if !ce.image.nil? %>
-                <a href="<%= ce.image.url %>" target="_blank"><img src="<%= ce.image.thumb.url %>" class="image-preview" /></a>
+          <% if !ce.nil? %>
+            <% case ce.type %>
+            <% when "text" %>
+              <%= ce.text %>
+            <% when "integer" %>
+              <%= ce.number %>
+            <% when "editor" %>
+              <%= ce.content.html_safe rescue "" %>
+            <% when "image" %>
+              <div class="image-expander">
+                <% if !ce.image.nil? %>
+                  <a href="<%= ce.image.url %>" target="_blank"><img src="<%= ce.image.thumb.url %>" class="image-preview" /></a>
+                <% end %>
+              </div>
+            <% when "date" %>
+              <%= format_date(ce.date, column.date_format) %> 
+            <% when "period" %>
+              <% if !ce.period_from.nil? %>
+                <%= format_date(ce.period_from, column.date_format) %> ~ <%= format_date(ce.period_to, column.date_format)  %> 
               <% end %>
-            </div>
-          <% when "date" %>
-            <%= format_date(ce.date, column.date_format) %> 
-          <% when "period" %>
-            <% if !ce.period_from.nil? %>
-              <%= format_date(ce.period_from, column.date_format) %> ~ <%= format_date(ce.period_to, column.date_format)  %> 
             <% end %>
+          <% else %>
+            &nbsp;
           <% end %>
           <% if index == 0 && can_edit %>
             <div class="quick-edit">
@@ -63,11 +66,6 @@
             </div>
           <% end %>
         </td>
-      <% else %>
-        <td>
-          &nbsp;
-        </td>
-      <% end %>
       <% end %>
       </tr>
     <% end %>