diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
index c6f1100a9..585ba77fc 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
@@ -20,9 +20,26 @@ body {
     text-decoration:none;
 }
 
-#file-details, #image-preview, #gallery {width:280px; float:left;}
+#file-details, #image-preview, #gallery {
+    /*border:1px solid #ff0000;*/
+    width:340px;
+    min-height:430px;
+    float:left;
+    }
 
-#file-details {float:right;}
+#file-details {
+    float:right;
+    width:220px;
+    }
+
+#file-list {
+    border:1px solid #bdbcbc;
+    height:324px;
+    max-height:324px;
+    overflow:scroll;
+    overflow-y:scroll;
+    overflow-x:hidden;
+    }
 
 input[disabled], input[disabled="disabled"], input.disabled {
     color: White 
@@ -91,7 +108,7 @@ legend            { font-weight: normal; border:none; }
 fieldset          { padding:0; margin: 0; border: 0px solid #dbdbdb; }
 #orchardmediapicker label { font-weight:normal; display:block; padding: 0 0 0 0; margin:10px 0 0 0; }
 #orchardmediapicker label.forcheckbox { display: inline; margin: 10px 0 0 4px; }
-#orchardmediapicker .actions { margin:12px 0 0 0; }
+#orchardmediapicker .actions { margin:12px 0 0 0; clear:both; text-align:left; }
 
 input[type="text"], select, textarea, input.text, input.textMedium, input.text-box {
     padding:3px;
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
index e859dc012..edffe48ab 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
@@ -32,6 +32,7 @@
 			</fieldset>
         </div>
         <fieldset>
+        <div id="file-list">
             <table class="items" summary="@T("This is a table of the images currently available for use in your application.")">
                 @foreach (var mediaFolder in Model.MediaFolders) {
                     <tr>
@@ -57,6 +58,7 @@
                     </tr>
                 }
             </table>
+            </div>
             @if (!String.IsNullOrWhiteSpace(Model.MediaPath)) {
                 using (Html.BeginFormAntiForgeryPost(uploadAction, FormMethod.Post, new { id="lib-uploadform", enctype = "multipart/form-data", onsubmit = "jQuery.mediaPicker.uploadMedia(this)" })) { 
                 <input type="hidden" name="MediaPath" value="@Model.MediaPath" />
@@ -73,7 +75,7 @@
         </div>
         <div id="file-details">
             <img alt="" id="lib-loader" style="display:none" src="" />
-            <fieldset style="width:200px">
+            <fieldset>
                 <label for="lib-src">@T("URL")</label>
                 <input type="text" id="lib-src" />
 
@@ -107,9 +109,11 @@
                 <input type="text" id="lib-height" />
 
                 <input type="checkbox" id="lib-lock" checked="checked" />
-                <label for="lib-lock">@T("Lock Aspect Ratio")</label>
+                <label class="forcheckbox" for="lib-lock">@T("Lock Aspect Ratio")</label>
 
-                <input type="button" id="lib-cancel" value="@T("Cancel")" />
+                <div class="actions">
                 <input type="button" id="lib-insert" value="@T("Insert")" class="disabled" data-edittext="@T("Update")" />
+                <input type="button" id="lib-cancel" value="@T("Cancel")" />
+                </div>
             </fieldset>
         </div>
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
index 7697065c6..51d45520c 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
@@ -33,7 +33,7 @@
 
         </div>
         <div id="file-details">
-            <fieldset style="width:200px;">
+            <fieldset>
                 <label for="img-alt">@T("Alternative Text")</label>
                 <input type="text" id="img-alt" />
 
@@ -64,9 +64,11 @@
                 <input type="text" id="img-height" />
 
                 <input type="checkbox" id="img-lock" checked="checked" />
-                <label for="img-lock">@T("Lock Aspect Ratio")</label>
+                <label class="forcheckbox" for="img-lock">@T("Lock Aspect Ratio")</label>
 
-                <input type="button" id="img-cancel" value="@T("Cancel")" />
+                <div class="actions">
                 <input type="button" id="img-insert" value="@T("Insert")" class="disabled" data-edittext="@T("Update")" />
+                <input type="button" id="img-cancel" value="@T("Cancel")" />
+                </div>
             </fieldset>
         </div>