diff --git a/functions.php b/functions.php
index 0e15607a..4d853291 100644
--- a/functions.php
+++ b/functions.php
@@ -1330,7 +1330,7 @@ function retrieve_metrics_cache () {
       }
    }
 
-   if ( ! isset($index_array) ) {
+   if ( ! isset($index_array) || sizeof($index_array) == 0 ) {
 
       if ( $debug == 1 ) {
          echo("DEBUG: Querying GMond for new data\n");
diff --git a/ganglia.php b/ganglia.php
index 873e0dde..7f43d59c 100644
--- a/ganglia.php
+++ b/ganglia.php
@@ -9,7 +9,9 @@
 # information as we need to make the page.
 #
 
-include_once($conf['ganglia_dir'] . "/version.php");
+$ganglia_dir = dirname(__FILE__);
+
+include_once($ganglia_dir . "/version.php");
 
 $error="";
 
@@ -35,7 +37,7 @@
 $version = array();
 
 # The web frontend version, from conf.php.
-$version["webfrontend"] = "$ganglia_version";
+$version["webfrontend"] = $GLOBALS["ganglia_version"];
 
 # Get rrdtool version
 $rrdtool_version = array();
diff --git a/get_context.php b/get_context.php
index 0cb08dca..00b508dc 100644
--- a/get_context.php
+++ b/get_context.php
@@ -1,16 +1,24 @@
 <?php
-/* $Id: get_context.php 2559 2011-04-11 22:01:34Z bernardli $ */
 
 include_once "./functions.php";
 
 $meta_designator = "Grid";
 $cluster_designator = "Cluster Overview";
 
-# Blocking malicious CGI input.
+///////////////////////////////////////////////////////////////////////////////
+// Determine which context we are in. Context is not specifically specified
+// so we have to figure it out ie. if vn(view_name) is present it's the views
+// context, if cluster name is specified without a hostname it's cluster etc.
+///////////////////////////////////////////////////////////////////////////////
+// Blocking malicious CGI input.
 $user['clustername'] = isset($_GET["c"]) ?
     escapeshellcmd( clean_string( rawurldecode($_GET["c"]) ) ) : NULL;
 $user['gridname'] = isset($_GET["G"]) ?
     escapeshellcmd( clean_string( rawurldecode($_GET["G"]) ) ) : NULL;
+
+$user['viewname'] = isset($_GET["vn"]) ?
+    escapeshellcmd( clean_string( rawurldecode($_GET["vn"]) ) ) : NULL;
+
 if($conf['case_sensitive_hostnames'] == 1) {
     $user['hostname'] = isset($_GET["h"]) ?
         escapeshellcmd( clean_string( rawurldecode($_GET["h"]) ) ) : NULL;
@@ -111,6 +119,10 @@
    {
       $context = "tree";
    }
+else if (isset($user['viewname']))
+   {
+      $context = "views";
+   }
 else if(!$user['clustername'] and !$user['gridname'] and !$user['hostname'])
    {
       $context = "meta";
diff --git a/header.php b/header.php
index 2742aad5..fa731239 100644
--- a/header.php
+++ b/header.php
@@ -64,7 +64,10 @@
 
 $tpl = new Dwoo_Template_File( template("$header.tpl") );
 $data = new Dwoo_Data();
+
+// Server offset used in generating pretty dates and times when zooming
 $data->assign("server_utc_offset", date('Z'));
+//
 $data->assign("page_title", $title);
 $data->assign("refresh", $conf['default_refresh']);
 
@@ -125,24 +128,19 @@
 $data->assign("cluster_url", $cluster_url);
 $alt_view = "";
 
-if ($context=="cluster")
-   {
-      $alt_view = "<a href=\"./?p=2&amp;c=$cluster_url\">Physical View</a>";
-   }
-elseif ($context=="physical")
-   {
-      $alt_view = "<a href=\"./?c=$cluster_url\">Full View</a>";
-   }
-elseif ($context=="node")
-   {
-      $alt_view =
-      "<a href=\"./?c=$cluster_url&amp;h=$node_url&amp;$get_metric_string\">Host View</a>";
-   }
-elseif ($context=="host")
-   {
-      $alt_view =
-      "<a href=\"./?p=2&amp;c=$cluster_url&amp;h=$node_url\">Node View</a>";
+if ($context == "cluster") {
+   $alt_view = "<a href=\"./?p=2&amp;c=$cluster_url\">Physical View</a>";
+} elseif ($context == "physical") {
+   $alt_view = "<a href=\"./?c=$cluster_url\">Full View</a>";
+} elseif ($context=="node") {
+   $alt_view = "<a href=\"./?c=$cluster_url&amp;h=$node_url&amp;$get_metric_string\">Host View</a>";
+} elseif ($context=="host") {
+   $alt_view = "<a href=\"./?p=2&amp;c=$cluster_url&amp;h=$node_url\">Node View</a>";
+} elseif ( $context = "views") {
+   if(  checkAccess( GangliaAcl::ALL_VIEWS, GangliaAcl::EDIT, $conf ) ) {
+       $alt_view = '<button onclick="return false" id="create_view_button">Create View</button>';
    }
+}
 
 $data->assign("alt_view", $alt_view);
 
@@ -164,76 +162,100 @@
 if ($physical)
    $node_menu .= hiddenvar("p", $physical);
 
-if ( $clustername )
-   {
-      $url = rawurlencode($clustername);
-      $node_menu .= "<B><A HREF=\"./?c=$url&amp;$get_metric_string\">$clustername</A></B> ";
-      $node_menu .= "<B>&gt;</B>\n";
-      $node_menu .= hiddenvar("c", $clustername);
-   }
-else
-   {
-      # No cluster has been specified, so drop in a list
-      $node_menu .= "<SELECT NAME=\"c\" OnChange=\"ganglia_form.submit();\">\n";
-      $node_menu .= "<OPTION VALUE=\"\">--Choose a Source\n";
-      ksort($grid);
-      foreach( $grid as $k => $v )
-         {
-            if ($k==$self) continue;
-            if (isset($v['GRID']) and $v['GRID'])
-               {
-                  $url = $v['AUTHORITY'];
-                  $node_menu .="<OPTION VALUE=\"$url\">$k $meta_designator\n";
-               }
-            else
-               {
-                  $url = rawurlencode($k);
-                  $node_menu .="<OPTION VALUE=\"$url\">$k\n";
-               }
-         }
-      $node_menu .= "</SELECT>\n";
-   }
-
-if ( $clustername && !$hostname )
-   {
-      # Drop in a host list if we have hosts
-      if (!$showhosts) {
-            $node_menu .= "[Summary Only]";
+//////////////////////////////////////////////////////////////////////////////
+// Cluster name has been specified. It comes right after
+// Grid > 
+//////////////////////////////////////////////////////////////////////////////
+if ( $clustername ) {
+   $url = rawurlencode($clustername);
+   $node_menu .= "<b><a href=\"./?c=$url&amp;$get_metric_string\">$clustername</a></b> ";
+   $node_menu .= "<b>&gt;</b>\n";
+   $node_menu .= hiddenvar("c", $clustername);
+} else if ( $viewname) {
+   $url = "Views";
+   $node_menu .= "<b><a href=\"./?vn=default&amp;$get_metric_string\">Views</a></b> ";
+   $node_menu .= "<b>&gt;</b>\n";
+}  else {
+   # No cluster has been specified, so drop in a list
+   $node_menu .= "<select name=\"c\" OnChange=\"ganglia_form.submit();\">\n";
+   $node_menu .= "<option value=\"\">--Choose a Source\n";
+   $node_menu .= "<option value=\"Views\">Views\n";
+   ksort($grid);
+   foreach( $grid as $k => $v )
+      {
+         if ($k==$self) continue;
+         if (isset($v['GRID']) and $v['GRID'])
+            {
+               $url = $v['AUTHORITY'];
+               $node_menu .="<OPTION VALUE=\"$url\">$k $meta_designator\n";
+            }
+         else
+            {
+               $url = rawurlencode($k);
+               $node_menu .="<OPTION VALUE=\"$url\">$k\n";
+            }
       }
-      elseif (is_array($hosts_up) || is_array($hosts_down))
-         {
-            $node_menu .= "<SELECT NAME=\"h\" OnChange=\"ganglia_form.submit();\">";
-            $node_menu .= "<OPTION VALUE=\"\">--Choose a Node\n";
-            if(is_array($hosts_up))
-               {
-                  uksort($hosts_up, "strnatcmp");
-                  foreach($hosts_up as $k=> $v)
-                     {
-                        $url = rawurlencode($k);
-                        $node_menu .= "<OPTION VALUE=\"$url\">$k\n";
-                     }
-               }
-            if(is_array($hosts_down))
-               {
-                  uksort($hosts_down, "strnatcmp");
-                  foreach($hosts_down as $k=> $v)
-                     {
-                        $url = rawurlencode($k);
-                        $node_menu .= "<OPTION VALUE=\"$url\">$k\n";
-                     }
-               }
-            $node_menu .= "</SELECT>\n";
-         }
-      else
-         {
-            $node_menu .= "<B>No Hosts</B>\n";
-         }
+   $node_menu .= "</select>\n";
+}
+
+if ( $context == "views" ) {
+   
+   $node_menu .= "<select name=\"vn\" OnChange=\"ganglia_form.submit();\">";
+   $node_menu .= "<option value=\"\">--Choose a View</option>";
+
+   $available_views = get_available_views();
+
+   foreach ( $available_views as $index => $view ) {
+      if ( $viewname == $view["view_name"])
+         $extra_options = "selected";
+      $node_menu .= "<option value=\"" . $view["view_name"] . "\" $extra_options >" . $view['view_name'] . "</option>";
+      unset($extra_options);
    }
-else
-   {
-      $node_menu .= "<B>$hostname</B>\n";
-      $node_menu .= hiddenvar("h", $hostname);
+   
+   $node_menu .= "</select>";
+   
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+// We are in the cluster view pop up a list box of nodes
+/////////////////////////////////////////////////////////////////////////////////
+if ( $clustername && !$hostname ) {
+   # Drop in a host list if we have hosts
+   if (!$showhosts) {
+         $node_menu .= "[Summary Only]";
    }
+   elseif (is_array($hosts_up) || is_array($hosts_down))
+      {
+         $node_menu .= "<select name=\"h\" OnChange=\"ganglia_form.submit();\">";
+         $node_menu .= "<option value=\"\">--Choose a Node</option>";
+         if(is_array($hosts_up))
+            {
+               uksort($hosts_up, "strnatcmp");
+               foreach($hosts_up as $k=> $v)
+                  {
+                     $url = rawurlencode($k);
+                     $node_menu .= "<option value=\"$url\">$k\n";
+                  }
+            }
+         if(is_array($hosts_down))
+            {
+               uksort($hosts_down, "strnatcmp");
+               foreach($hosts_down as $k=> $v)
+                  {
+                     $url = rawurlencode($k);
+                     $node_menu .= "<option value=\"$url\">$k\n";
+                  }
+            }
+         $node_menu .= "</select>\n";
+      }
+   else
+      {
+         $node_menu .= "<B>No Hosts</B>\n";
+      }
+} else {
+   $node_menu .= "<B>$hostname</B>\n";
+   $node_menu .= hiddenvar("h", $hostname);
+}
 
 # Save other CGI variables
 $node_menu .= hiddenvar("cr", $controlroom);
@@ -390,14 +412,14 @@
 
 $custom_time = "";
 
-if ($context == "meta" or $context == "cluster" or $context == "host")
+if ($context == "meta" or $context == "cluster" or $context == "host" or $context == "views")
    {
       $examples = "Feb 27 2007 00:00, 2/27/2007, 27.2.2007, now -1 week,"
          . " -2 days, start + 1 hour, etc.";
-      $custom_time = "&nbsp;&nbsp;or <span class=\"nobr\">from <INPUT TYPE=\"TEXT\" TITLE=\"$examples\" NAME=\"cs\" ID=\"datepicker-cs\" SIZE=\"17\"";
+      $custom_time = "&nbsp;&nbsp;or <span class=\"nobr\">from <input type=\"TEXT\" title=\"$examples\" NAME=\"cs\" ID=\"datepicker-cs\" SIZE=\"17\"";
       if ($cs)
          $custom_time .= " value=\"$cs\"";
-      $custom_time .= "> to <INPUT TYPE=\"TEXT\" TITLE=\"$examples\" NAME=\"ce\" ID=\"datepicker-ce\" SIZE=\"17\"";
+      $custom_time .= "> to <input type=\"TEXT\" title=\"$examples\" name=\"ce\" ID=\"datepicker-ce\" SIZE=\"17\"";
       if ($ce)
          $custom_time .= " value=\"$ce\"";
       $custom_time .= "> <input type=\"submit\" value=\"Go\">\n";
diff --git a/index.php b/index.php
index aca89ea4..d04472b0 100644
--- a/index.php
+++ b/index.php
@@ -74,6 +74,12 @@
       include_once "./header.php";
       include_once "./host_view.php";
    }
+else if ($context == "views")
+   {
+      $title = "$viewname view";
+      include_once "./header.php";
+      include_once "./views_view.php";
+   }
 else
    {
       $title = "Unknown Context";
diff --git a/js/ganglia.js b/js/ganglia.js
index f7c07904..b9538180 100644
--- a/js/ganglia.js
+++ b/js/ganglia.js
@@ -51,11 +51,13 @@ $(function(){
 
   $( "#datepicker-cs" ).datepicker({
 	  showOn: "button",
+	  constrainInput: false,
 	  buttonImage: "img/calendar.gif",
 	  buttonImageOnly: true
   });
   $( "#datepicker-ce" ).datepicker({
 	  showOn: "button",
+	  constrainInput: false,
 	  buttonImage: "img/calendar.gif",
 	  buttonImageOnly: true
   });
@@ -213,3 +215,17 @@ function ganglia_submit(clearonly) {
   if (! clearonly)
     document.ganglia_form.submit();
 }
+
+/* ----------------------------------------------------------------------------
+ Enlarges a graph using Flot
+-----------------------------------------------------------------------------*/
+function enlargeGraph(graphArgs) {
+  $("#enlarge-graph-dialog").dialog('open');
+  $("#enlarge-graph-dialog").bind( "dialogbeforeclose", function(event, ui) {
+    $("#enlargeTooltip").remove();
+  });
+//  $('#enlarge-graph-dialog-content').html('<img src="graph.php?' + graphArgs + '" />');
+  $.get('enlarge_graph.php', "flot=1&" + graphArgs, function(data) {
+    $('#enlarge-graph-dialog-content').html(data);
+  })
+}
diff --git a/templates/default/host_view.tpl b/templates/default/host_view.tpl
index f9248d52..fefa64be 100644
--- a/templates/default/host_view.tpl
+++ b/templates/default/host_view.tpl
@@ -128,17 +128,6 @@ function toggleMetricGroup(mgId, mgDiv) {
   document.ganglia_form.submit();
 }
 
-function enlargeGraph(graphArgs) {
-  $("#enlarge-graph-dialog").dialog('open');
-  $("#enlarge-graph-dialog").bind( "dialogbeforeclose", function(event, ui) {
-    $("#enlargeTooltip").remove();
-  });
-//  $('#enlarge-graph-dialog-content').html('<img src="graph.php?' + graphArgs + '" />');
-  $.get('enlarge_graph.php', "flot=1&" + graphArgs, function(data) {
-    $('#enlarge-graph-dialog-content').html(data);
-  })
-}
-
 $(function() {
   // Modified from http://jqueryui.com/demos/toggle/
   //run the currently selected effect
diff --git a/templates/default/meta_view.tpl b/templates/default/meta_view.tpl
index a7cb751d..06f16d2b 100644
--- a/templates/default/meta_view.tpl
+++ b/templates/default/meta_view.tpl
@@ -21,6 +21,11 @@
 {/if}
 
 <table border="0" width="100%">
+<tr>
+  <td class="cluster" colspan="3">
+    <a href="?vn=default&r=hour"><strong>Views</strong></a> {$source.alt_view}
+  </td>
+</tr>
 
 {foreach $sources source}
 <tr>
diff --git a/templates/default/views_view.tpl b/templates/default/views_view.tpl
new file mode 100644
index 00000000..cbdb89c5
--- /dev/null
+++ b/templates/default/views_view.tpl
@@ -0,0 +1,33 @@
+<style>
+.img_view {
+  float: left;
+  margin: 0 0 10px 10px;
+}
+</style>
+
+<div id="views-content">
+  <div id=view_graphs>
+    {if $number_of_view_items == 0 }
+    <div class="ui-widget">
+      <div class="ui-state-default ui-corner-all" style="padding: 0 .7em;"> 
+        <p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
+          No graphs defined for this view. Please add some
+      </div>
+    </div>
+      
+    {else}
+      {foreach $view_items view_item}
+      <div class="img_view">
+        <button title="Export to CSV" class="cupid-green" onClick="javascript:location.href='graph.php?{$view_item.url_args}&amp;csv=1';return false;">CSV</button>
+        <button title="Export to JSON" class="cupid-green" onClick="javascript:location.href='graph.php?{$view_item.url_args}&amp;json=1';return false;">JSON</button>
+        {if $view_item.aggregate_graph == 1}
+        <button title="Decompose aggregate graph" class="cupid-green" onClick="javascript:location.href='graph_decompose.php?{$view_item.url_args}&decompose=1';return false;">Decompose</button>
+        {/if}
+        <button title="Enlarge Graph" onClick="enlargeGraph('{$view_item.url_args}'); return false;" class="cupid-green">Enlarge</button>
+        <br /><a href="graph_all_periods.php?{$view_item.url_args}"><img border="0" src="graph.php?{$view_item.url_args}" /></a>
+      </div>
+      {/foreach}
+    {/if}
+  </div>
+</div>
+<div style="clear: left"></div>
diff --git a/version.php.in b/version.php.in
index 2809f321..4bd43901 100644
--- a/version.php.in
+++ b/version.php.in
@@ -1,6 +1,6 @@
 <?php
 # This file is autogenerated
 
-$ganglia_version = "@GWEB_VERSION@";
+$GLOBALS["ganglia_version"] = "@GWEB_VERSION@";
 
 ?>
diff --git a/views_view.php b/views_view.php
new file mode 100644
index 00000000..92d9b13e
--- /dev/null
+++ b/views_view.php
@@ -0,0 +1,60 @@
+<?php
+
+$tpl = new Dwoo_Template_File( template("views_view.tpl") );
+$data = new Dwoo_Data();
+$data->assign("range",$range);
+
+if( ! checkAccess(GangliaAcl::ALL_VIEWS, GangliaAcl::VIEW, $conf) ) {
+  die("You do not have access to view views.");
+}
+
+$available_views = get_available_views();
+// Pop up a warning message if there are no available views
+// (Disable temporarily, otherwise we can't create views)
+if ( sizeof($available_views) == -1 ) {
+    $error_msg = '
+	<div class="ui-widget">
+			  <div class="ui-state-error ui-corner-all" style="padding: 0 .7em;"> 
+				  <p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span> 
+				  <strong>Alert:</strong> There are no views defined.</p>
+			  </div>
+	</div>
+    ';
+}
+
+
+foreach ( $available_views as $view_id => $view ) {
+
+ if ( $view['view_name'] == $user["viewname"] ) {
+
+    $view_elements = get_view_graph_elements($view);
+
+    $view_items = array();
+
+    if ( count($view_elements) != 0 ) {
+        
+      $graphargs = "";
+      if ($cs)
+         $graphargs .= "&amp;cs=" . rawurlencode($cs);
+      if ($ce)
+         $graphargs .= "&amp;ce=" . rawurlencode($ce);
+        
+      foreach ( $view_elements as $id => $element ) {
+        $view_items[] = array ( "legend" => isset($element['hostname']) ? $element['hostname'] : "Aggregate graph",
+          "url_args" => htmlentities($element['graph_args']) . "&amp;z=medium&r=" . $range . $graphargs,
+          "aggregate_graph" => isset($element['aggregate_graph']) ? 1 : 0
+        );
+      }
+    }
+    
+    
+    $data->assign("number_of_view_items", sizeof($view_items));
+    break;
+        
+ }  // end of if ( $view['view_name'] == $view_name
+} // end of foreach ( $views as $view_id 
+
+$data->assign("view_items", $view_items);
+$dwoo->output($tpl, $data);
+
+?>