Index: www/sites/all/themes/scan/np-scan-analytics-scans.tpl.php
===================================================================
--- www/sites/all/themes/scan/np-scan-analytics-scans.tpl.php	(revision 34174)
+++ www/sites/all/themes/scan/np-scan-analytics-scans.tpl.php	(working copy)
@@ -43,9 +43,15 @@
 
 $time_query = drupal_query_string_encode($_GET, array('q', 'timeframe'));
 $time_query = (!empty($time_query) ? '&'. $time_query : '');
-$timeframe = !empty($_GET['timeframe']) ? $_GET['timeframe'] : ($page == 'views' ? 'all' : 48);
 
 if ($page == 'views') {
+  $timeframe = !empty($_GET['timeframe']) ? $_GET['timeframe'] : 'all';
+}
+else {
+  $timeframe = 48;
+}
+
+if ($page == 'views') {
   $timeframes = array(
     'timeframe-24-hrs'. ($timeframe == 24 ? ' selected' : '') => array(
       'title' => t('Last 24 hours'),
@@ -59,31 +65,6 @@
     ),
   );
 }
-else {
-  $timeframes = array(
-    'timeframe-24-hrs'. ($timeframe == 24 ? ' selected' : '') => array(
-      'title' => t('Last 24 hours'),
-      'query' => 'timeframe=24'. $time_query,
-      'href'  => $_GET['q'],
-    ),
-    'timeframe-48-hrs'. (!in_array($timeframe, array(24, 168, 720)) ? ' selected' : '') => array(
-      'title' => t('Last 48 hours'),
-      'query' => 'timeframe=48'. $time_query,
-      'href'  => $_GET['q'],
-    ),
-    'timeframe-168-hrs'. ($timeframe == 168 ? ' selected' : '') => array(
-      'title' => t('Last 7 days'),
-      'query' => 'timeframe=168'. $time_query,
-      'href'  => $_GET['q'],
-    ),
-    'timeframe-720-hrs'. ($timeframe == 720 ? ' selected' : '') => array(
-      'title' => t('Last 30 days'),
-      'query' => 'timeframe=720'. $time_query,
-      'href'  => $_GET['q'],
-    ),
-  );
-}
-
 ?>
 <div class="span-32">
 
@@ -151,9 +132,11 @@
       </div>
       <?php print theme('links', $links, array('class' => 'list-tab-02')); ?>
     <?php endif; ?>
+    <?php if ($page == 'views'): ?>
     <div class="np-box">
       <?php print theme('links', $timeframes, array('class' => 'list-v list-dropdown span-5')); ?>
     </div>
+    <?php endif; ?>
 
     <div class="np-box">
       <ul class="list-v np-margin-b025em" id="np-scan-analytics-scans">
@@ -169,24 +152,7 @@
               break;
 
             case 'links':
-              switch($timeframe) {
-                case 24:
-                  $data = intval($scan->stats->url_velocity_day);
-                  break;
-
-                case 168:
-                  $data = intval($scan->stats->url_velocity_week);
-                  break;
-
-                case 'all':
-                case 720:
-                  $data = intval($scan->stats->url_velocity_month);
-                  break;
-
-                default:
-                  $data = intval($scan->stats->url_velocity_biday);
-                  break;
-              }
+              $data = intval($scan->stats->url_velocity);
               $type = 'Link';
               $graph_name = 'bar-'. ($scan->stats->difference > 0 ? 'u-' : 'd-') . $json_name . $scan->nid;
               break;
@@ -196,24 +162,7 @@
               // Fall through, so no break this time.
 
             default:
-              switch($timeframe) {
-                case 24:
-                  $data = intval($scan->stats->velocity_day);
-                  break;
-
-                case 168:
-                  $data = intval($scan->stats->velocity_week);
-                  break;
-
-                case 'all':
-                case 720:
-                  $data = intval($scan->stats->velocity_month);
-                  break;
-
-                default:
-                  $data = intval($scan->stats->velocity_biday);
-                  break;
-              }
+              $data = intval($scan->stats->velocity);
               $type = 'Post';
               break;
           }
@@ -222,41 +171,12 @@
             $stories[] = $destination->page_name;
           }
 
-          switch($timeframe) {
-            case 24:
-              $link_stats = array(
-                'general' => $scan->stats->general_day,
-                'photo'   => $scan->stats->photo_day,
-                'video'   => $scan->stats->video_day,
-              );
-              break;
+          $link_stats = array(
+            'general' => $scan->stats->general,
+            'photo'   => $scan->stats->photo,
+            'video'   => $scan->stats->video,
+          );
 
-            case 168:
-               $link_stats = array(
-                'general' => $scan->stats->general_week,
-                'photo'   => $scan->stats->photo_week,
-                'video'   => $scan->stats->video_week,
-              );
-              break;
-
-            case 'all':
-            case 720:
-               $link_stats = array(
-                'general' => $scan->stats->general_month,
-                'photo'   => $scan->stats->photo_month,
-                'video'   => $scan->stats->video_month,
-              );
-              break;
-
-            default:
-               $link_stats = array(
-                'general' => $scan->stats->general_biday,
-                'photo'   => $scan->stats->photo_biday,
-                'video'   => $scan->stats->video_biday,
-              );
-              break;
-          }
-
         ?>
         <li class="clearfix">
           <div class="header clearfix">
Index: www/sites/all/modules/custom/np_scan/np_scan.analytics.inc
===================================================================
--- www/sites/all/modules/custom/np_scan/np_scan.analytics.inc	(revision 34177)
+++ www/sites/all/modules/custom/np_scan/np_scan.analytics.inc	(working copy)
@@ -104,7 +104,13 @@
   $scans = array();
   // this variable gonna be handy later
   $key = 'scan_id';
-  $timeframe = !empty($_GET['timeframe']) ? $_GET['timeframe'] : ($page == 'views' ? 'all' : 48);
+  
+  if ($page == 'views') {
+    $timeframe = !empty($_GET['timeframe']) ? $_GET['timeframe'] : 'all';
+  }
+  else {
+    $timeframe = 48;
+  }
 
   switch ($page) {
     case 'views':
@@ -267,46 +273,19 @@
         }
 
         // Fill up the url uniq stats part. Initialize to 0.
-        $statistics->velocity_day = 0;
-        $statistics->general_day = 0;
-        $statistics->photo_day = 0;
-        $statistics->video_day = 0;
-        $statistics->velocity_biday = 0;
-        $statistics->general_biday = 0;
-        $statistics->photo_biday = 0;
-        $statistics->video_biday = 0;
-        $statistics->velocity_week = 0;
-        $statistics->general_week = 0;
-        $statistics->photo_week = 0;
-        $statistics->video_week = 0;
-        $statistics->velocity_month = 0;
-        $statistics->general_month = 0;
-        $statistics->photo_month = 0;
-        $statistics->video_month = 0;
+        $statistics->velocity = 0;
+        $statistics->general = 0;
+        $statistics->photo = 0;
+        $statistics->video = 0;
 
-        $statistics->url_velocity_day = 0;
-        $statistics->url_velocity_biday = 0;
-        $statistics->url_velocity_week = 0;
-        $statistics->url_velocity_month = 0;
+        $statistics->url_velocity = 0;
 
         $fields = array(
           'scan_id' => 1,
-          'hours.velocity24' => 1,
-          'hours.general.velocity24' => 1,
-          'hours.photo.velocity24' => 1,
-          'hours.video.velocity24' => 1,
           'hours.velocity' => 1,
           'hours.general.velocity' => 1,
           'hours.photo.velocity' => 1,
           'hours.video.velocity' => 1,
-          'days.velocity7' => 1,
-          'days.general.velocity7' => 1,
-          'days.photo.velocity7' => 1,
-          'days.video.velocity7' => 1,
-          'days.velocity' => 1,
-          'days.general.velocity' => 1,
-          'days.photo.velocity' => 1,
-          'days.video.velocity' => 1,
         );
         $query = array(
           'scan_id' => intval($statistics->scan_id),
@@ -317,27 +296,12 @@
               ->find($query, $fields)
               ->timeout(scan_api_get_mongo_timeout());
             foreach ($results as $row) {
-              $statistics->velocity_day = isset($row['hours']['velocity24']) ? $row['hours']['velocity24'] : 0;
-              $statistics->general_day = isset($row['hours']['general']['velocity24']) ? $row['hours']['general']['velocity24'] : 0;
-              $statistics->photo_day = isset($row['hours']['photo']['velocity24']) ? $row['hours']['photo']['velocity24'] : 0;
-              $statistics->video_day = isset($row['hours']['video']['velocity24']) ? $row['hours']['video']['velocity24'] : 0;
-              $statistics->velocity_biday = isset($row['hours']['velocity']) ? $row['hours']['velocity'] : 0;
-              $statistics->general_biday = isset($row['hours']['general']['velocity']) ? $row['hours']['general']['velocity'] : 0;
-              $statistics->photo_biday = isset($row['hours']['photo']['velocity']) ? $row['hours']['photo']['velocity'] : 0;
-              $statistics->video_biday = isset($row['hours']['video']['velocity']) ? $row['hours']['video']['velocity'] : 0;
-              $statistics->velocity_week = isset($row['days']['velocity7']) ? $row['days']['velocity7'] : 0;
-              $statistics->general_week = isset($row['days']['general']['velocity7']) ? $row['days']['general']['velocity7'] : 0;
-              $statistics->photo_week = isset($row['days']['photo']['velocity7']) ? $row['days']['photo']['velocity7'] : 0;
-              $statistics->video_week = isset($row['days']['video']['velocity7']) ? $row['days']['video']['velocity7'] : 0;
-              $statistics->velocity_month = isset($row['days']['velocity']) ? $row['days']['velocity'] : 0;
-              $statistics->general_month = isset($row['days']['general']['velocity']) ? $row['days']['general']['velocity'] : 0;
-              $statistics->photo_month = isset($row['days']['photo']['velocity']) ? $row['days']['photo']['velocity'] : 0;
-              $statistics->video_month = isset($row['days']['video']['velocity']) ? $row['days']['video']['velocity'] : 0;
+              $statistics->velocity = isset($row['hours']['velocity']) ? $row['hours']['velocity'] : 0;
+              $statistics->general = isset($row['hours']['general']['velocity']) ? $row['hours']['general']['velocity'] : 0;
+              $statistics->photo = isset($row['hours']['photo']['velocity']) ? $row['hours']['photo']['velocity'] : 0;
+              $statistics->video = isset($row['hours']['video']['velocity']) ? $row['hours']['video']['velocity'] : 0;
 
-              $statistics->url_velocity_day = isset($row['hours']['velocity24']) ? $row['hours']['velocity24'] : 0;
-              $statistics->url_velocity_biday = isset($row['hours']['velocity']) ? $row['hours']['velocity'] : 0;
-              $statistics->url_velocity_week = isset($row['days']['velocity7']) ? $row['days']['velocity7'] : 0;
-              $statistics->url_velocity_month = isset($row['days']['velocity']) ? $row['days']['velocity'] : 0;
+              $statistics->url_velocity = isset($row['hours']['velocity']) ? $row['hours']['velocity'] : 0;
             }
           }
           catch (MongoCursorTimeoutException $e) {