diff --git a/templates/2k11/admin/media_upload.tpl b/templates/2k11/admin/media_upload.tpl
index bbaaac19..3a3647ca 100644
--- a/templates/2k11/admin/media_upload.tpl
+++ b/templates/2k11/admin/media_upload.tpl
@@ -31,9 +31,10 @@
                     <option value="hotlink">{$CONST.FETCH_METHOD_HOTLINK}</option>
                 </select>
             </div>
-            <span class="standalone">{$CONST.WORD_OR}</span>
         </div>
 
+        <span class="standalone hilite_b">{$CONST.WORD_OR}</span>
+
         <div id="upload_template">
             <div class="form_field">
                 <label for="userfile_1" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index d2a2f793..39112f3c 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -433,7 +433,8 @@ label > span,
 .msg_notice,
 .msg_dialogue,
 #serendipity_category .form_multiselect label,
-#image_directory_edit_form .form_select label { display: block; }
+#image_directory_edit_form .form_select label,
+#uploadform label { display: block; }
 
 .image_resize_hint p { display: inline; }
 
@@ -959,6 +960,11 @@ summary { cursor: pointer; }
 
 /* CONTENT
    ----------------------------------------------------------------- */
+.image_add_form br {
+    display: none;
+    visibility: hidden;
+} /* Temporary */
+
 .users_delete_action,
 #edit_entry_timestamp,
 #media_pane_filter { position: relative; }
@@ -1108,7 +1114,17 @@ fieldset p,
 
 /* SMALL SCREEN (e.g. smartphones)
    ----------------------------------------------------------------- */
-@media only screen and (min-width: 481px) { }
+@media only screen and (min-width: 481px) {
+    #uploadform label {
+        display: inline-block;
+        *display: inline;
+        *zoom: 1;
+        min-width: 40%;
+    }
+
+    #uploadform .form_field input,
+    #uploadform .form_select select { min-width: 16em; }
+}
 
 
 /* MEDIUM SCREEN (e.g. tablets)