diff --git a/ooyala_markers/ooyala_markers.module b/ooyala_markers/ooyala_markers.module
index 97c760c..6e6cb6a 100644
--- a/ooyala_markers/ooyala_markers.module
+++ b/ooyala_markers/ooyala_markers.module
@@ -50,6 +50,7 @@ function ooyala_markers_element_info() {
     '#input' => TRUE,
     '#columns' => array('title', 'time'),
     '#process' => array('ooyala_markers_element_process'),
+    '#theme_wrappers' => array('form_element'),
   );
   return $elements;
 }
@@ -103,7 +104,7 @@ function ooyala_markers_field_widget_settings_form($field, $instance) {
  */
 function ooyala_markers_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
   $element += array(
-    '#type' => $field['type'],
+    '#type' => 'ooyala_marker',
     '#default_value' => isset($items[$delta]) ? $items[$delta] : '',
   );
   return $element;  
@@ -222,11 +223,11 @@ function theme_ooyala_marker($elements) {
 
   drupal_add_css(drupal_get_path('module', 'ooyala_markers') .'/ooyala_markers.css');
 
-  $output = '<div class="ooyala-markers-field clear-block">';
-  $output .= check_plain($element['#title']);
+  $output = '<div class="ooyala-markers-field clearfix">';
   $output .= '<div class="ooyala-markers-field-title ooyala-markers-field-column">' . drupal_render($element['title']) . '</div>';
   $output .= '<div class="ooyala-markers-field-time ooyala-markers-field-column">' . drupal_render($element['time']) . '</div>';
-  $output .= '</div><br /><br /><br /><br /><br />';
+  $output .= '</div>';
+
   return $output;
 }