diff --git a/src/Orchard.Web/Core/Contents/Views/Content.Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.Edit.cshtml
index 534856f87..a612e975b 100644
--- a/src/Orchard.Web/Core/Contents/Views/Content.Edit.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Content.Edit.cshtml
@@ -18,4 +18,6 @@
             </div>
         }
     </div>
-</div>
\ No newline at end of file
+</div>
+
+@Html.Hidden("returnUrl", Request.QueryString["returnUrl"])
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Media.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Media.Edit.cshtml
index ee08a573d..a612e975b 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Media.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Media.Edit.cshtml
@@ -1,8 +1,23 @@
-<div class="sections">
-    <div class="primary">
-        @Display(Model.Content)
+<div class="edit-item">
+    <div class="edit-item-primary">
+        @if (Model.Content != null) {
+            <div class="edit-item-content">
+                @Display(Model.Content)
+            </div>
+        }
     </div>
-    <div class="secondary">
-        @Display(Model.Sidebar)
+    <div class="edit-item-secondary group">
+        @if (Model.Actions != null) {
+            <div class="edit-item-actions">
+                @Display(Model.Actions)
+            </div>
+        }
+        @if (Model.Sidebar != null) {
+            <div class="edit-item-sidebar group">
+                @Display(Model.Sidebar)
+            </div>
+        }
     </div>
 </div>
+
+@Html.Hidden("returnUrl", Request.QueryString["returnUrl"])
\ No newline at end of file