Index: media.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.admin.inc,v
retrieving revision 1.19
diff -u -p -r1.19 media.admin.inc
--- media.admin.inc	19 Aug 2010 21:45:13 -0000	1.19
+++ media.admin.inc	7 Sep 2010 14:55:54 -0000
@@ -53,6 +53,9 @@ function media_admin($form, $form_state)
     'css' => array($path . '/css/media.css'),
   );
 
+  // Build the display switch.
+  $form['switch'] = media_admin_display_switch(array('active display' => $display));
+
   if (isset($form_state['values']['operation']) && $form_state['values']['operation'] == 'delete') {
     return media_multiple_delete_confirm($form, $form_state, array_filter($form_state['values']['files']));
   }
@@ -85,9 +88,6 @@ function media_admin($form, $form_state)
 
   $form['admin'] = $types[$display]['callback']();
 
-  // Build the display switch.
-  $form['switch'] = media_admin_display_switch(array('active display' => $display));
-
   return $form;
 }
 
@@ -136,6 +136,7 @@ function media_admin_list() {
    '#header' => $header,
    '#options' => $options,
    '#empty' => t('No media available.'),
+   '#attributes' => array('class' => array('media-display-table', 'media-clear')),
   );
   $form['pager'] = array('#markup' => theme('pager', array('tags' => NULL)));
 
@@ -156,7 +157,7 @@ function media_admin_thumbnails() {
   $options = array();
   $form['files'] = array(
    '#tree' => TRUE,
-   '#prefix' => '<div class="media-display-thumbnails clearfix"><ul class="media-list-thumbnails">',
+   '#prefix' => '<div class="media-display-thumbnails media-clear clearfix"><ul class="media-list-thumbnails">',
    '#suffix' => '</ul></div>',
   );
 
Index: css/media.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/css/media.css,v
retrieving revision 1.12
diff -u -p -r1.12 media.css
--- css/media.css	5 Aug 2010 02:39:15 -0000	1.12
+++ css/media.css	7 Sep 2010 14:55:54 -0000
@@ -274,9 +274,18 @@ div#media-browser .throbber {
 }
 
 #edit-options {
+  clear: both;
   margin: 0;
 }
 
+.media-clear {
+  clear: both;
+}
+
+.media-thumbnails-select {
+  float: left;
+}
+
 #edit-options .form-item-format label {
   display: inline;
 }
Index: javascript/media-admin.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/javascript/media-admin.js,v
retrieving revision 1.13
diff -u -p -r1.13 media-admin.js
--- javascript/media-admin.js	13 Aug 2010 19:12:22 -0000	1.13
+++ javascript/media-admin.js	7 Sep 2010 14:55:54 -0000
@@ -42,7 +42,7 @@ Drupal.behaviors.mediaAdmin = {
     // @TODO: Support grabbing more than one page of thumbnails.
     $('<div class="media-thumbnails-select" />')
       .append('<strong>' + Drupal.t('Select') + ':</strong> <a href="#">' + Drupal.t('all') + '</a>, <a href="#">' + Drupal.t('none') + '</a>')
-      .prependTo('.media-display-thumbnails')
+      .prependTo('#media-admin > div')
       .find('a')
       .click(function () {
         var link = $(this);