diff --git a/templates/user/storage.html b/templates/user/storage.html
index 2076a72..79ae35b 100644
--- a/templates/user/storage.html
+++ b/templates/user/storage.html
@@ -5,96 +5,110 @@
     <h1>Storage Index</h1>
 
     <div class="be-quicklist">
-	<a class="be-gui-link"
-	   title="Click to view your Dashboard"
-	   href="/dashboard">
-	    <img alt="Dashboard"
-		 src="/images/icons/dashboard.png">
-	    View Dashboard
-	</a>
-	<a class="be-gui-link"
-	   title="Click to view your Archive Index"
-	   href="/user/archive">
-	    <img alt="Archive Index"
-		 src="/images/icons/index.png">
-	    Archive Index
-	</a>
-	<a class="be-gui-link"
-	   title="Click to view your Pages Index"
-	   href="/user/pages">
-	    <img alt="Pages Index"
-		 src="/images/icons/index.png">
-	    Pages Index
-	</a>
+        <a class="be-gui-link"
+           title="Click to view your Dashboard"
+           href="/dashboard">
+            <img alt="Dashboard"
+	         src="/images/icons/dashboard.png">
+            View Dashboard
+        </a>
+        <a class="be-gui-link"
+           title="Click to view your Archive Index"
+           href="/user/archive">
+            <img alt="Archive Index"
+	         src="/images/icons/index.png">
+            Archive Index
+        </a>
+        <a class="be-gui-link"
+           title="Click to view your Pages Index"
+           href="/user/pages">
+            <img alt="Pages Index"
+	         src="/images/icons/index.png">
+            Pages Index
+        </a>
     </div>
     
     <div class="be-storage-section-upload">
-	<form action="/storage/multi-upload"
+        <form action="/storage/multi-upload"
 	      method="POST"
 	      enctype="multipart/form-data">
-	    <input required
-		   type="hidden"
-		   name="AUTHENTICITY-TOKEN"
-		   value="{{token}}">
-	    <input required
-		   type="file"
-		   name="STORAGE-FILES"
-		   multiple>
-	    <button class="be-gui-button-no-text"
-		    title="Click to upload files to storage"
-		    type="submit">
-		<img alt="Upload to Storage"
-		     src="/images/icons/up-arrow.png">
-	    </button>
-	</form>
+            <input required
+	           type="hidden"
+	           name="AUTHENTICITY-TOKEN"
+	           value="{{token}}">
+            <input required
+	           type="file"
+	           name="STORAGE-FILES"
+	           multiple>
+            <button class="be-gui-button-no-text"
+	            title="Click to upload files to storage"
+	            type="submit">
+	        <img alt="Upload to Storage"
+	             src="/images/icons/up-arrow.png">
+            </button>
+        </form>
     </div>
     
     <div class="be-storage-section">
-	{% for item in files %}
-	<div class="be-storage-entry">
-	    <img class="file-thumbnail" src="{{ item | build-thumbnail-path }}" alt="{{item.name}}">
-	    <a class="be-gui-link-no-text"
+        {% for item in files %}
+        <div class="be-storage-entry">
+            <img class="file-thumbnail" src="{{ item | build-thumbnail-path }}" alt="{{item.name}}">
+            <a class="be-gui-link-no-text"
 	       title="Click to view '{{item.name}}'"
 	       href="/storage/view/media/{{item.slug}}">
-		<img alt="{{entry.title}}"
-		     src="/images/icons/view-entry.png">
-	    </a>
-	    {% if roles.administrator %}
-	    <form class="be-storage-rename"
-		  action="/storage/rename/{{item.slug}}"
-		  method="POST">
-		<input required
-		       type="hidden"
-		       name="AUTHENTICITY-TOKEN"
-		       value="{{token}}">
-		<input required
-		       type="text"
-		       name="NEW-FILE-NAME"
-		       value="{{item.name}}">
-		<button class="be-gui-button-no-text"
-			title="Click to rename '{{item.name}}'"
-			type="submit">
-		    <img alt="Rename {{item.name}}"
-			 src="/images/icons/save.png">
-		</button>
-	    </form>
-	    <form class="be-storage-delete"
-		  action="/storage/delete/{{item.slug}}"
-		  method="POST">
-		<input required
-		       type="hidden"
-		       name="AUTHENTICITY-TOKEN"
-		       value="{{token}}">
-		<button class="be-gui-button-no-text"
-			title="Click to delete '{{item.name}}'"
-			type="submit">
-		    <img alt="Delete {{item.name}}"
-			 src="/images/icons/delete-entry.png">
-		</button>
-	    </form>
-	    {% endif %}
-	</div>
-	{% endfor %}
+	        <img alt="{{entry.title}}"
+	             src="/images/icons/view-entry.png">
+            </a>
+            <div class="be-popup-container">
+                <span class="be-popup"
+                      id="{{item.slug}}-popup">
+                    Copied
+                </span>
+            <button class="be-gui-button-no-text"
+                    onclick="copyToClipBoard('{{item.slug}}')"
+                    data="{{item.slug}}"
+	            title="Copy URL for '{{item.name}}' to clipboard"
+	            type="submit">
+	        <img alt="Copy to clipboard"
+	             src="/images/icons/copy.png">
+            </button>
+            </div>
+            {% if roles.administrator %}
+            <form class="be-storage-rename"
+	          action="/storage/rename/{{item.slug}}"
+	          method="POST">
+	        <input required
+	               type="hidden"
+	               name="AUTHENTICITY-TOKEN"
+	               value="{{token}}">
+	        <input required
+	               type="text"
+	               name="NEW-FILE-NAME"
+	               value="{{item.name}}">
+	        <button class="be-gui-button-no-text"
+		               title="Click to rename '{{item.name}}'"
+		               type="submit">
+	            <img alt="Rename {{item.name}}"
+	                 src="/images/icons/save.png">
+	        </button>
+            </form>
+            <form class="be-storage-delete"
+	          action="/storage/delete/{{item.slug}}"
+	          method="POST">
+	        <input required
+	               type="hidden"
+	               name="AUTHENTICITY-TOKEN"
+	               value="{{token}}">
+	        <button class="be-gui-button-no-text"
+		               title="Click to delete '{{item.name}}'"
+		               type="submit">
+	            <img alt="Delete {{item.name}}"
+	                 src="/images/icons/delete-entry.png">
+	        </button>
+            </form>
+            {% endif %}
+        </div>
+        {% endfor %}
     </div>
 </div>
 {% endblock %}