diff --git a/web/views/attachments.html b/web/views/attachments.html
index dc618283..cb272167 100644
--- a/web/views/attachments.html
+++ b/web/views/attachments.html
@@ -78,7 +78,9 @@ <h2>
       </form>
     </details>
 
-    {{template "p/attachments-table" .Attachments}}
+    {{range $val := .Attachments}}
+    {{template "p/attachment" $val}}
+    {{end}}
   </section>
 </main>
 
diff --git a/web/views/envelopes-view.html b/web/views/envelopes-view.html
index fff49419..491789de 100644
--- a/web/views/envelopes-view.html
+++ b/web/views/envelopes-view.html
@@ -54,7 +54,9 @@ <h2><a href="#message">Message</a></h2>
   {{if .Envelope.Attachments}}
   <section id="attachments">
     <h2><a href="#attachments">Attachments</a></h2>
-    {{template "p/attachments-table" .Envelope.Attachments}}
+    {{range $val := .Envelope.Attachments}}
+    {{template "p/attachment" $val}}
+    {{end}}
   </section>
   {{end}}
 
diff --git a/web/views/index.html b/web/views/index.html
index c772ce21..7b777a64 100644
--- a/web/views/index.html
+++ b/web/views/index.html
@@ -51,19 +51,19 @@ <h2>Retention Policy</h2>
         <tbody>
           {{if .RetentionPolicy.EnvelopeCount}}
           <tr>
-            <th scope="row"><strong>Envelope Count Limit</strong></th>
+            <th scope="row"><strong>Max Envelope Count</strong></th>
             <td>{{.RetentionPolicy.EnvelopeCount}}</td>
           </tr>
           {{end}}
           {{if .RetentionPolicy.EnvelopeAge}}
           <tr>
-            <th scope="row"><strong>Envelope Age Limit</strong></th>
+            <th scope="row"><strong>Max Envelope Age</strong></th>
             <td>{{.RetentionPolicy.EnvelopeAge}}</td>
           </tr>
           {{end}}
           {{if .RetentionPolicy.AttachmentSize}}
           <tr>
-            <th scope="row"><strong>Attachment Size Limit</strong></th>
+            <th scope="row"><strong>Max Attachments Size</strong></th>
             <td>{{bytesHumanize .RetentionPolicy.AttachmentSize}}</td>
           </tr>
           {{end}}
diff --git a/web/views/p/attachment.html b/web/views/p/attachment.html
new file mode 100644
index 00000000..b4306e4d
--- /dev/null
+++ b/web/views/p/attachment.html
@@ -0,0 +1,27 @@
+<article>
+  {{if .IsImage}}
+  <a href="/files/{{.FileName}}">
+    <img src="/files/{{.FileName}}" alt="{{.FileName}}">
+  </a>
+  {{else}}
+  <h2>
+    <a href="/files/{{.FileName}}">
+      {{.Name}}
+    </a>
+  </h2>
+  {{end}}
+  <nav>
+    <ul>
+      {{if .IsImage}}
+      <li>
+        {{.Name}}
+      </li>
+      {{end}}
+    </ul>
+    <ul>
+      <li>
+        <a href="/envelopes/{{.MessageID}}">Envelope</a>
+      </li>
+    </ul>
+  </nav>
+</article>
diff --git a/web/views/p/attachments-table.html b/web/views/p/attachments-table.html
deleted file mode 100644
index 9f6cb8b8..00000000
--- a/web/views/p/attachments-table.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<figure>
-  <table>
-    <thead>
-      <tr>
-        <th>ID</th>
-        <th>Name</th>
-        <th>Mime</th>
-      </tr>
-    </thead>
-    <tbody>
-      {{range $val := .}}
-      <tr>
-        <td>
-          <a href="/files/{{$val.FileName}}">{{$val.ID}}</a>
-        </td>
-        <td>
-          <a href="/files/{{$val.FileName}}">{{$val.Name}}</a>
-        </td>
-        <td>
-          <a href="/files/{{$val.FileName}}">{{$val.Mime}}</a>
-        </td>
-      </tr>
-      {{end}}
-    </tbody>
-  </table>
-</figure>