diff --git a/includes/videojs.theme.inc b/includes/videojs.theme.inc
index de93b51..5864f81 100644
--- a/includes/videojs.theme.inc
+++ b/includes/videojs.theme.inc
@@ -10,7 +10,10 @@
 function videojs_preprocess_videojs_formatter_videojs(&$vars) {
   $field_name = $vars['element']['#field_name'];
   $node = $vars['element']['#node'];
-
+  if (!isset($node->$field_name)) {
+    $node = node_load($node->nid);
+  }
+  
   $vars['player_id'] = $node->nid . '-' . str_replace('_', '-', $field_name);
   $vars['items'] = (array) $node->$field_name;
   $vars['attributes'] =  array(
@@ -67,22 +70,26 @@ function videojs_preprocess_videojs_formatter_videojs(&$vars) {
       }
     }
   }
-
-  template_preprocess_videojs($vars);
+  
+  videojs_preprocess_videojs($vars);
 }
 
 /**
  * Preprocess function for videojs.tpl.php when displaying a view as a playlist.
  */
-function template_preprocess_videojs_view(&$vars) {
-  videojs_add();
+function videojs_preprocess_videojs_view(&$vars) {
+  $vars['attributes'] =  array(
+    'width' => intval(variable_get('videojs_width', 640)),
+    'height' => intval(variable_get('videojs_height', 264)),
+  );
+  videojs_preprocess_videojs($vars);
   $vars['player_id'] = 'videojs-view-' . str_replace('_', '-', $vars['view']->name);
 }
 
 /**
  * Preprocess function for videojs.tpl.php when displaying a view as a playlist.
  */
-function template_preprocess_videojs(&$vars) {
+function videojs_preprocess_videojs(&$vars) {
   videojs_add();
 
   $items = $vars['items'];
diff --git a/includes/videojs_style_plugin.inc b/includes/videojs_style_plugin.inc
index 5f7880c..b467165 100644
--- a/includes/videojs_style_plugin.inc
+++ b/includes/videojs_style_plugin.inc
@@ -79,7 +79,7 @@ class videojs_style_plugin extends views_plugin_style {
     $fields = $this->display->handler->get_handlers('field');
 
     $items = array();
-
+    
     foreach ($sets as $title => $records) {
       foreach ($records as $row_index => $row) {
         $filepath = NULL;
@@ -90,25 +90,15 @@ class videojs_style_plugin extends views_plugin_style {
             break;
           }
         }
-
-        $file = db_fetch_object(db_query("SELECT filepath FROM {files} WHERE fid = %d", $fileid));
-        $filepath = $file->filepath;
-        $this->view->row_index = $row_index;
-        $label = trim(strip_tags($this->row_plugin->render($row)));
-        if (empty($label)) {
-          $label = basename($filepath);
-        }
+        $file = db_fetch_array(db_query("SELECT * FROM {files} WHERE fid = %d", $fileid));
+        
         // get the file path from the file object
-
-        $items[] = array(
-          'url' => file_create_url($filepath),
-          'label' => $label,
-        );
+        $items[] = $file;
       }
     }
-
-    $output = theme('videojs_view_playlist', $view, $items);
-
+    
+    $output = theme('videojs_view', $view, $items);
+    
     // If doing a live preview, add the JavaScript directly to the output.
     if (isset($view->live_preview) && $view->live_preview) {
       $js = drupal_add_js();