diff --git a/entityreference_browser.js b/entityreference_browser.js
index 758a3f2..a435fc2 100644
--- a/entityreference_browser.js
+++ b/entityreference_browser.js
@@ -15,84 +15,85 @@
     }
   };
 
-})(jQuery);
-
-
-jQuery(document).ready(function($) {
-  var data = {};
-  // Add view settings to the data.
-  for (var key in Drupal.settings.views.ajaxViews[0]) {
-    data[key] = Drupal.settings.views.ajaxViews[0][key];
-  }
+  $(document).ready(function() {
+    var data = {};
+    // Add view settings to the data.
+    for (var key in Drupal.settings.views.ajaxViews[0]) {
+      data[key] = Drupal.settings.views.ajaxViews[0][key];
+    }
 
-  $.ajax({
-    url: Drupal.settings.views.ajax_path,
-    type: 'GET',
-    data: data,
-    success: function(response) {
-      var viewDiv = '.view-dom-id-' + data.view_dom_id;
-      var target = $('div.entityreference-browser-view-widget');
-      if (response[2] != null) {
-        target.html(response[2].data);
-      }
-      if (Drupal.settings && Drupal.settings.views && Drupal.settings.views.ajaxViews) {
-        $.each(Drupal.settings.views.ajaxViews, function(i, settings) {
-          // @todo: Figure out where to store the object.
-          new Drupal.views.ajaxView(settings);
+    $.ajax({
+      url: Drupal.settings.views.ajax_path,
+      type: 'GET',
+      data: data,
+      success: function(response) {
+        var viewDiv = '.view-dom-id-' + data.view_dom_id;
+        var target = $('div.entityreference-browser-view-widget');
+        if (response[2] != null) {
+          target.html(response[2].data);
+        }
+        if (Drupal.settings && Drupal.settings.views && Drupal.settings.views.ajaxViews) {
+          $.each(Drupal.settings.views.ajaxViews, function(i, settings) {
+            // @todo: Figure out where to store the object.
+            new Drupal.views.ajaxView(settings);
+          });
+        }
+
+        // put a listener on the drag / drop UL item
+        var $select = $(".entityreference-browser-selected");
+        $select.sortable({
+          update: entityreference_browser_update
         });
+      },
+      error: function(xhr) {
+        // This is your custom code right?
+        var target = $('div.entityreference-browser-view-widget');
+        target.html('<p id="artist-load-error">Error text.</p>');
+        $('#block-request-0').hide();
+      },
+      dataType: 'json'
+    });
+
+    $('body').delegate('a.picker', 'click', function(event) {
+      event.preventDefault;
+
+      var entityId = $(this).attr('data-id');
+      var label = $(this).text();
+
+      // Add entity only one time.
+      if(!$('li[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);
+
+        $('ul.entityreference-browser').append(entityItem);
+
+        entityreference_browser_update();
       }
 
-      // put a listener on the drag / drop UL item
-      var $select = $(".entityreference-browser-selected");
-      $select.sortable({
-        update: entityreference_browser_update
-      });
-    },
-    error: function(xhr) {
-      var target = $('div.entityreference-browser-view-widget');
-      target.html('<p id="artist-load-error">Error text.</p>');
-      $('#block-request-0').hide();
-    },
-    dataType: 'json'
-  });
+      return false;
+    });
 
-  $('body').delegate('a.picker', 'click', function(event) {
-    event.preventDefault;
+    $('body').delegate('a.remove', 'click', function(event) {
+      event.preventDefault;
 
-    var entityId = $(this).attr('data-id');
-    var label = $(this).text();
-    
-    // Add entity only one time.
-    if(!$('li[data-id="' + entityId + '"]').length) {
-      var entityItemRemove = $('<a />').attr('href', '/node/' + entityId).attr('class', 'remove').attr('data-id', entityId).html(' [remove] ');
-      var entityItem = $('<li />').attr('data-id', entityId).html(label).append(entityItemRemove);
+      var entityId = $(this).attr('data-id');
 
-      $('ul.entityreference-browser').append(entityItem);
+      $('li[data-id="' + entityId + '"]').remove();
 
       entityreference_browser_update();
-    }
-    
-    return false;
-  });
-
-  $('body').delegate('a.remove', 'click', function(event) {
-    event.preventDefault;
-
-    var entityId = $(this).attr('data-id');
+      return false;
+    });
 
-    $('li[data-id="' + entityId + '"]').remove();
-
-    entityreference_browser_update();
-    return false;
   });
 
-});
+  function entityreference_browser_update(event, ui) {
+    var items = [];
+    $(".entityreference-browser-selected li").each(function(index) {
+      items.push($(this).attr('data-id'));
+    });
 
-function entityreference_browser_update(event, ui) {
-  var items = [];
-  jQuery(".entityreference-browser-selected li").each(function(index) {
-    items.push(jQuery(this).attr('data-id'));
-  });
+    $("input.entityreference-browser-values").val(items.join(','));
+  }
 
-  jQuery("input.entityreference-browser-values").val(items.join(','));
-}
+})(jQuery);
\ No newline at end of file
diff --git a/entityreference_browser.module b/entityreference_browser.module
index 241c9b6..cc109d9 100644
--- a/entityreference_browser.module
+++ b/entityreference_browser.module
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * The main functionalities are located here.
+ */
 
 /**
  * Implements hook_views_api().
@@ -79,7 +83,7 @@ function entityreference_browser_field_formatter_view($entity_type, $entity, $fi
   switch ($display['type']) {
     case 'entityreference_browser_formatter':
       foreach ($items as $delta => $item) {
-        $output = "<input type=\"checkbox\" /> <a data-id=\"{$item['value']}\" href=\"node/{$item['value']}\">{$item['value']}</a>";
+        $output = '<input type="checkbox" /> ' . l($item['value'], 'node/' . $item['value'], array('attributes' => array('data-id' => $item['value'])));
         $element[$delta] = array('#markup' => $output);
       }
       break;
@@ -214,12 +218,25 @@ function entityreference_browser_field_widget_form(&$form, &$form_state, $field,
   $selected_entities = entity_load($entity_type, $selected_entity_ids);
 
   // Build HTML to represent selected items
-  $markup_selected  = '<div class="entityreference-browser-widget-left"><ul data-ec="' . $ec . '" class="entityreference-browser entityreference-browser-selected">';
+  $entities_array = array();
   foreach ($selected_entities as $id => $loaded_entity) {
-    $remove_item_link = ' <a href="/node/' . $id . '" class="remove" data-id="' . $id . '">[remove]</a>';
-    $markup_selected .= '<li data-ec="' . $ec . '" data-id="' . $id . '">' . $loaded_entity->title . $remove_item_link . '</li>';
+    $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);
   }
-  $markup_selected .= '</ul></div>';
+
+  $variables = array(
+    'items' => $entities_array,
+    'title'=> NULL,
+    'type' => 'ul',
+    'attributes' => array(
+      'data-ec' => $ec,
+      'class' => 'entityreference-browser entityreference-browser-selected'
+    )
+  );
+
+  $markup_selected  = '<div class="entityreference-browser-widget-left">';
+  $markup_selected .= theme('item_list', $variables);
+  $markup_selected .= '</div>';
 
   $element += array(
     '#type' => 'hidden',
diff --git a/views/entityreference_browser.views.inc b/views/entityreference_browser.views.inc
index 3cff2e3..f3f4c00 100644
--- a/views/entityreference_browser.views.inc
+++ b/views/entityreference_browser.views.inc
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Alters the table structure.
+ */
 
 /**
  * Implements hook_views_data_alter().
@@ -8,7 +12,7 @@ function entityreference_browser_views_data_alter(&$data) {
     if (isset($info['base table']) && isset($data[$info['base table']]['table'])) {
       $data[$info['base table']]['entityreference_browser'] = array(
         'title' => $data[$info['base table']]['table']['group'],
-        'group' => t('Entityreference  Browser'),
+        'group' => t('Entityreference Browser'),
         'help' => t('Provide a field that allows for selecting of this entity within the widget'),
         'real field' => $info['entity keys']['id'],
         'field' => array(
diff --git a/views/entityreference_browser.views_default.inc b/views/entityreference_browser.views_default.inc
index b8491ca..6b5141c 100644
--- a/views/entityreference_browser.views_default.inc
+++ b/views/entityreference_browser.views_default.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * nova_magnet.views_default.inc
+ * Provides the default entity reference browser view.
  */
 
 /**
diff --git a/views/entityreference_browser_field_picker.inc b/views/entityreference_browser_field_picker.inc
index c66b209..1fcd251 100644
--- a/views/entityreference_browser_field_picker.inc
+++ b/views/entityreference_browser_field_picker.inc
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Contains the views field handler.
+ */
 
 /**
  * Field handler used in the Browser View. It creates a selectable link.
@@ -14,10 +18,10 @@ class entityreference_browser_field_picker extends views_handler_field {
   }
 
   function label() {
-    return "Select Content";
+    return t('Select Content');
   }
 
   function render($values) {
-    return "<a data-id=\"{$values->nid}\" href=\"/node/{$values->nid}\" class=\"picker\">{$values->node_title}</a>";
+    return l($values->node_title, 'node/' . $values->nid, array('attributes' => array('class' => 'picker', 'data-id' => $values->nid)));
   }
-}
\ No newline at end of file
+}