diff --git a/app/views/bids/_app_link.html.erb b/app/views/bids/_app_link.html.erb
index 645fe94f9..d61f4ef87 100644
--- a/app/views/bids/_app_link.html.erb
+++ b/app/views/bids/_app_link.html.erb
@@ -1,8 +1,24 @@
-<% for attachment in attachments %>
-    <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
-    <% if attachment.is_text? %>
-        <%= link_to image_tag('magnifier.png'),
-                    :controller => 'attachments', :action => 'show',
-                    :id => attachment, :filename => attachment.filename %>
-    <% end %>
-<% end -%>
\ No newline at end of file
+<table style="width: 200px;table-layout: fixed" >
+    <tr>
+      <% count = 0 %>
+      <% for attachment in attachments %>
+          <% if attachments.count == 1 %>
+            <td title="<%= attachment.filename%>" style="width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+              <%= render :partial => 'attachment', :locals => {:attachment => attachment}  %>
+            </td>
+          <% elsif  attachments.count == 2 %>
+              <td title="<%= attachment.filename%>" style="width: 100px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                <%= render :partial => 'attachment', :locals => {:attachment => attachment}  %>
+              </td>
+          <% else %>
+              <td title="<%= attachment.filename%>" style="width: 66px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                <% if count == 3 %>
+                    <% break %>
+                <% end %>
+                <%= render :partial => 'attachment', :locals => {:attachment => attachment}  %>
+                <% count = count +1 %>
+              </td>
+          <% end %>
+      <% end %>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/app/views/bids/_attachment.html.erb b/app/views/bids/_attachment.html.erb
new file mode 100644
index 000000000..6bccc08f5
--- /dev/null
+++ b/app/views/bids/_attachment.html.erb
@@ -0,0 +1,6 @@
+<%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+<% if attachment.is_text? %>
+    <%= link_to image_tag('magnifier.png'),
+                :controller => 'attachments', :action => 'show',
+                :id => attachment, :filename => attachment.filename,:style => "width:50px"%>
+<% end %>
\ No newline at end of file
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index b52ac6933..0a92df47d 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -132,8 +132,8 @@
                     </tr>
 
 					<tr>
-						<td style="vertical-align: top;width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <% if is_evaluation %>
+						<td style="vertical-align: top;width: 200px;">
+                          <% if is_evaluation || is_teacher%>
                               <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments}  %>
                           <% end %>
                         </td>