diff --git a/contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc b/contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc
index f410b02..1d6bbba 100644
--- a/contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc
+++ b/contrib/views_slideshow_singleframe/views_slideshow_singleframe.theme.inc
@@ -1,4 +1,5 @@
 <?php
+// $Id: views_slideshow_singleframe.theme.inc,v 1.1.2.1.2.28 2010/07/13 04:02:08 redndahead Exp $
 
 /**
  * @file
@@ -9,31 +10,11 @@
  * Implements template_preprocess_hook_THEMENAME().
  */
 function template_preprocess_views_slideshow_singleframe(&$vars) {
+  
   $options = $vars['options'];
   $rows = $vars['rows'];
   $view = $vars['view'];
   $vss_id = $view->name . '-' . $view->current_display;
-  $settings = $options['views_slideshow_singleframe'];
-  
-  // Cast the strings into int or bool as necessary.
-  $new_settings = array();
-  foreach ($settings as $key => $value) {
-    if (is_string($value)) {
-      $value = trim($value);
-
-      if (is_numeric($value)) {
-        $value = (int)$value;
-      }
-      elseif (strtolower($value) == 'true') {
-        $value = TRUE;
-      }
-      elseif (strtolower($value) == 'false') {
-        $value = FALSE;
-      }
-    }
-    
-    $new_settings[$key] = $value;
-  }
 
   $settings = array_merge(
     array(
@@ -42,7 +23,7 @@ function template_preprocess_views_slideshow_singleframe(&$vars) {
       'div_prefix' => '#views_slideshow_singleframe_div_',
       'vss_id' => $vss_id,
     ),
-    $new_settings
+    $options['views_slideshow_singleframe']
   );
 
   // We need to go through the current js setting values to make sure the one we
@@ -72,9 +53,9 @@ function template_preprocess_views_slideshow_singleframe(&$vars) {
   $singleframe = $vars['options']['views_slideshow_singleframe'];
 
   // Only show controls when there is more than one result.
-  $vars['controls_top'] = '';
-  $vars['controls_bottom'] = '';
-  if ($settings['num_divs'] > 1) {
+  /*if ($settings['num_divs'] > 1) { */
+  /*Warranty controls are renders only if rows returned generate more than one slide*/
+  if(count($rows) > $view->style_plugin->options['views_slideshow_singleframe']['items_per_slide']){
     if ($singleframe['controls'] == 1) {
       $vars['controls_top'] = theme('views_slideshow_singleframe_controls', $vss_id, $view, $options);
     }
@@ -83,8 +64,6 @@ function template_preprocess_views_slideshow_singleframe(&$vars) {
     }
   }
 
-  $vars['pager_top'] = '';
-  $vars['pager_bottom'] = '';
   if ($singleframe['pager'] == 1) {
     $vars['pager_top'] = theme('views_slideshow_singleframe_pager', $vss_id, $view, $options);
   }
@@ -92,8 +71,6 @@ function template_preprocess_views_slideshow_singleframe(&$vars) {
     $vars['pager_bottom'] = theme('views_slideshow_singleframe_pager', $vss_id, $view, $options);
   }
   
-  $vars['image_count_top'] = '';
-  $vars['image_count_bottom'] = '';
   if ($singleframe['image_count'] == 1) {
     $vars['image_count_top'] = theme('views_slideshow_singleframe_image_count', $vss_id, $view, $options);
   }