diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss
index a053946a80..23b032a4e9 100644
--- a/lms/static/sass/course/wiki/_wiki.scss
+++ b/lms/static/sass/course/wiki/_wiki.scss
@@ -1,7 +1,7 @@
 section.wiki {
   padding-top: 25px;
 
-  header {
+  > header {
     height: 33px;
     margin-bottom: 36px;
     padding-bottom: 26px;
@@ -406,6 +406,7 @@ section.wiki {
     letter-spacing: 0 !important;
 
     &:hover {
+      color: $base-font-color;
       text-decoration: none;
     }
 
@@ -621,14 +622,58 @@ section.wiki {
 
   .attachment-options {
     height: 40px;
-    margin-bottom: 30px;
-    padding: 20px 0 2px;
-    border-bottom: 1px solid $light-gray;
-    border-top: 1px solid $light-gray;    
+    margin: 40px 0 30px; 
   }
 
   .attachment-list {
-    
+    ul {
+      list-style: none;
+      padding: 0;
+    }
+
+    li {
+      margin-bottom: 15px;
+      border: 1px solid #DDD;
+      background: #F9F9F9;
+      @include border-radius(5px);
+    }
+
+    header,
+    .attachment-details {
+      padding: 12px 15px;
+    }
+
+    .attachment-details {
+      background: #eee;
+      @include border-radius(0 0 5px 5px);
+    }
+
+    h3 {
+      a {
+        font-weight: bold;
+        font-size: 0.9em;
+      }
+
+      .badge {
+        float: right;
+        font-size: 0.6em;
+        line-height: 20px;
+        color: #aaa;
+      }
+    }
+
+    .attachment-description {
+      font-size: 0.8em;
+    }
+
+    table {
+      width: 100%;
+      font-size: 0.8em;
+    }
+
+    .attachment-actions .btn {
+      float: right;
+    }
   }
 
 
diff --git a/lms/templates/wiki/plugins/attachments/index.html b/lms/templates/wiki/plugins/attachments/index.html
index d110bc709e..d448392933 100644
--- a/lms/templates/wiki/plugins/attachments/index.html
+++ b/lms/templates/wiki/plugins/attachments/index.html
@@ -62,66 +62,68 @@
 
 
   <div class="attachment-list">
-    <p class="lead">{% trans "The following files are available for this article. Copy the markdown tag to directly refer to a file from the article text." %}</p>
-    {% for attachment in attachments %}
-      <table class="table table-bordered table-striped" style="width: 100%;">
-      <tr>
-        <td colspan="4">
-          <h3>
-            <a href="{% url 'wiki:attachments_download' path=urlpath.path article_id=article.id attachment_id=attachment.id %}">{{ attachment.current_revision.get_filename }}</a>
-            <span class="badge">{{ attachment.current_revision.created|naturaltime }}</span>
-            {% if attachment.current_revision.deleted %}
-            <span class="badge badge-important">{% trans "deleted" %}</span>
-            {% endif %}
-          </h3>
-          {{ attachment.current_revision.description }}
-        </td>
-      </tr>
-      <tr>
-        <th>{% trans "Markdown tag" %}</th>
-        <th>{% trans "Uploaded by" %}</th>
-        <th>{% trans "Size" %}</th>
-        <td style="text-align: right;" rowspan="2">
-          {% if attachment|can_write:user %}
-            <p>
-            {% if not attachment.current_revision.deleted %}
-              <a href="{% url 'wiki:attachments_replace' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Replace" %}</a>
-              {% if attachment.article = article %}
-                <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Delete" %}</a>
-              {% else %}
-                <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Detach" %}</a>
+    <!--<p class="lead">{% trans "The following files are available for this article. Copy the markdown tag to directly refer to a file from the article text." %}</p>-->
+    <ul>
+      {% for attachment in attachments %}
+        <li>
+          <header>
+            <h3>
+              <a href="{% url 'wiki:attachments_download' path=urlpath.path article_id=article.id attachment_id=attachment.id %}">{{ attachment.current_revision.get_filename }}</a>
+              <span class="badge">{{ attachment.current_revision.created|naturaltime }}</span>
+              {% if attachment.current_revision.deleted %}
+              <span class="badge badge-important">{% trans "deleted" %}</span>
               {% endif %}
-            {% else %}
-              {% if attachment.current_revision.previous_revision.id %}
-              <form method="POST" action="{% url 'wiki:attachments_revision_change' path=urlpath.path article_id=article.id attachment_id=attachment.id revision_id=attachment.current_revision.previous_revision.id %}">
-                {% csrf_token %}
-                <button class="btn">
-                  {% trans "Restore" %}
-                </button>
-              </form>
-              {% endif %}
-            {% endif %}
+            </h3>
+            <p class="attachment-description">
+              {{ attachment.current_revision.description }}
             </p>
-          {% endif %}
-          <p>
-          <a href="{% url 'wiki:attachments_history' path=urlpath.path article_id=article.id attachment_id=attachment.id %}">
-            <span class="icon-time"></span>
-            {% trans "File history" %} ({{ attachment.attachmentrevision_set.all.count }} {% trans "revisions" %})
-          </a>
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td><code>[attachment:{{ attachment.id }}]</code></td>
-        <td>
-        {% if attachment.current_revision.user %}{{ attachment.current_revision.user }}{% else %}{% if user|is_moderator %}{{ attachment.current_revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %}
-        </td>
-        <td>{{ attachment.current_revision.get_size|filesizeformat }}</td>
-      </tr>
-      </table>
-    {% empty %}
-      <p style="margin-bottom: 20px;"><em>{% trans "There are no attachments for this article." %}</em></p>
-    {% endfor %}
+          </header>
+          <div class="attachment-details">
+            <table>
+            <tr>
+              <th>{% trans "Markdown tag" %}</th>
+              <th>{% trans "Uploaded by" %}</th>
+              <th>{% trans "Size" %}</th>
+              <th>{% trans "File History" %}</th>
+              <td class="attachment-actions">
+                {% if attachment|can_write:user %}
+                  {% if not attachment.current_revision.deleted %}
+                    {% if attachment.article = article %}
+                      <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-danger">{% trans "Delete" %}</a>
+                    {% else %}
+                      <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Detach" %}</a>
+                    {% endif %}
+
+                    <a href="{% url 'wiki:attachments_replace' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Replace" %}</a>
+                    
+                  {% else %}
+                    {% if attachment.current_revision.previous_revision.id %}
+                    <form method="POST" action="{% url 'wiki:attachments_revision_change' path=urlpath.path article_id=article.id attachment_id=attachment.id revision_id=attachment.current_revision.previous_revision.id %}">
+                      {% csrf_token %}
+                      <button class="btn">
+                        {% trans "Restore" %}
+                      </button>
+                    </form>
+                    {% endif %}
+                  {% endif %}
+                {% endif %}                
+              </td>
+            </tr>
+            <tr>
+              <td><code>[attachment:{{ attachment.id }}]</code></td>
+              <td>
+              {% if attachment.current_revision.user %}{{ attachment.current_revision.user }}{% else %}{% if user|is_moderator %}{{ attachment.current_revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %}
+              </td>
+              <td>{{ attachment.current_revision.get_size|filesizeformat }}</td>
+              <td>{{ attachment.attachmentrevision_set.all.count }} {% trans "revisions" %}</td>
+            </tr>
+            </table>
+          </div>
+        </li>
+      {% empty %}
+        <p style="margin-bottom: 20px;"><em>{% trans "There are no attachments for this article." %}</em></p>
+      {% endfor %}
+    </ul>
   </div>