diff --git a/css/media_browser_plus.views.css b/css/media_browser_plus.views.css
index b09a786..f07fb05 100644
--- a/css/media_browser_plus.views.css
+++ b/css/media_browser_plus.views.css
@@ -2,9 +2,9 @@
  * Formatting the media browser plus views.
  */
 
-.view .mbp-folders {
-  float: left;
-  width: 19%;
+.view .mbp-folders,
+.view .mbp-file-list {
+  vertical-align: top;
 }
 
 .view .mbp-folders ol {
@@ -49,8 +49,6 @@
 }
 
 .view .mbp-file-list {
-  float: right;
-  width: 80%;
   border-left: 1px solid #cccccc;
   padding-left: 10px;
 }
diff --git a/views/media-browser-plus-views-view-media-browser.tpl.php b/views/media-browser-plus-views-view-media-browser.tpl.php
index 28c8947..c089244 100644
--- a/views/media-browser-plus-views-view-media-browser.tpl.php
+++ b/views/media-browser-plus-views-view-media-browser.tpl.php
@@ -9,21 +9,27 @@
  */
 ?>
 <?php print $wrapper_prefix; ?>
-<div class="clearfix">
-<?php if(!empty($folders)) : ?>
-<div class="mbp-folders">
-  <?php print $folders ?>
-</div>
-<?php endif; ?>
-  <div class="mbp-file-list">
-    <?php print $list_type_prefix; ?>
-      <?php foreach ($rows as $id => $row): ?>
-        <li id="media-item-<?php print $view->result[$id]->fid; ?>" class="<?php print $classes_array[$id]; ?>">
-          <?php print $row; ?>
-        </li>
-      <?php endforeach; ?>
-    <?php print $list_type_suffix; ?>
-    <div id="status"></div>
-  </div>
-</div>
+<table>
+  <thead>
+    <tr>
+      <?php if(!empty($folders)) : ?><th width="200">Folders</th><?php endif; ?>
+      <th width="*">Media Files</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <?php if(!empty($folders)) : ?><td class="mbp-folders"><?php print $folders ?></td><?php endif; ?>
+      <td class="mbp-file-list">
+        <?php print $list_type_prefix; ?>
+        <?php foreach ($rows as $id => $row): ?>
+          <li id="media-item-<?php print $view->result[$id]->fid; ?>" class="<?php print $classes_array[$id]; ?>">
+            <?php print $row; ?>
+          </li>
+        <?php endforeach; ?>
+        <?php print $list_type_suffix; ?>
+        <div id="status"></div>
+      </td>
+    </tr>
+  </tbody>
+</table>
 <?php print $wrapper_suffix; ?>