diff --git a/entityreference_browser.js b/entityreference_browser.js
index b284a65..fae3051 100644
--- a/entityreference_browser.js
+++ b/entityreference_browser.js
@@ -39,8 +39,8 @@
           });
         }
 
-        // put a listener on the drag / drop UL item
-        var $select = $(".entityreference-browser-selected");
+        // put a listener on the drag / drop table item
+        var $select = $(".entityreference-browser-selected tbody");
         $select.sortable({
           update: entityreference_browser_update
         });
@@ -67,12 +67,12 @@
       }
 
       // Add entity only one time.
-      if(!$('li[data-id="' + entityId + '"]').length) {
+      if(!$('tr[data-id="' + entityId + '"]').length) {
         // We should support more than only nodes.
-        var entityItemRemove = $('<a />').attr('href', Drupal.settings.basePath + 'node/' + entityId).attr('class', 'remove').attr('data-id', entityId).html('[' + Drupal.t('remove') + ']');
-        var entityItem = $('<li />').attr('data-id', entityId).html(label + ' ').append(entityItemRemove);
+        var entityItemRemove = $('<td />').append($('<a />').attr('href', Drupal.settings.basePath + 'node/' + entityId).attr('class', 'remove button').attr('data-id', entityId).html(Drupal.t('remove')));
+        var entityItem = $('<tr />').attr('data-id', entityId).attr('class', 'clearfix').html('<td>' + label + '</td>').append(entityItemRemove);
 
-        $('ul.entityreference-browser').append(entityItem);
+        $('table.entityreference-browser').append(entityItem);
 
         entityreference_browser_update();
       }
@@ -85,7 +85,7 @@
 
       var entityId = $(this).attr('data-id');
 
-      $('li[data-id="' + entityId + '"]').remove();
+      $('tr[data-id="' + entityId + '"]').remove();
 
       entityreference_browser_update();
       return false;
@@ -95,7 +95,7 @@
 
   function entityreference_browser_update(event, ui) {
     var items = [];
-    $(".entityreference-browser-selected li").each(function(index) {
+    $(".entityreference-browser-selected tr").each(function(index) {
       items.push($(this).attr('data-id'));
     });
 
diff --git a/entityreference_browser.module b/entityreference_browser.module
index 34dfbe1..5f987d2 100644
--- a/entityreference_browser.module
+++ b/entityreference_browser.module
@@ -220,22 +220,30 @@ function entityreference_browser_field_widget_form(&$form, &$form_state, $field,
   // Build HTML to represent selected items.
   $entities_array = array();
   foreach ($selected_entities as $id => $loaded_entity) {
-    $remove_item_link = l('[' . t('remove') . ']', 'node/' . $id, array('attributes' => array('class' => 'remove', 'data-id' => $id)));
-    $entities_array[] = array('data' => $loaded_entity->title . ' ' . $remove_item_link, 'data-ec' => $ec, 'data-id' => $id);
+    $remove_item_link = l(t('remove'), 'node/' . $id, array('attributes' => array('class' => 'remove button', 'data-id' => $id)));
+    $entities_array[] = array(
+      'data' => array(
+        $loaded_entity->title,
+        $remove_item_link
+      ),
+      'data-ec' => $ec,
+      'data-id' => $id,
+      'class' => array('clearfix')
+    );
   }
 
   $variables = array(
-    'items' => $entities_array,
-    'title'=> NULL,
-    'type' => 'ul',
+    'header' => array(t('Title'), t('Operations')),
+    'rows' => $entities_array,
     'attributes' => array(
       'data-ec' => $ec,
-      'class' => 'entityreference-browser entityreference-browser-selected'
-    )
+      'class' => array('entityreference-browser', 'entityreference-browser-selected')
+    ),
+    'empty' => t('No entites were referenecd.')
   );
 
   $markup_selected  = '<div class="entityreference-browser-widget-left">';
-  $markup_selected .= theme('item_list', $variables);
+  $markup_selected .= theme('table', $variables);
   $markup_selected .= '</div>';
 
   $element += array(