diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index 1f005694..7f104734 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -2108,6 +2108,18 @@ void gGraphView::selectionTime()
     }
 
 }
+void gGraphView::GetRXBounds(qint64 st, qint64 et)
+{
+    qint64 m1=0,m2=0;
+    gGraph *g=NULL;
+    for (int i=0;i<m_graphs.size();i++) {
+        g=m_graphs[i];
+        if (g->group()==0)
+            break;
+    }
+    st=g->rmin_x;
+    et=g->rmax_x;
+}
 void gGraphView::ResetBounds(bool refresh) //short group)
 {
     Q_UNUSED(refresh)
diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h
index b1717daa..0d388b24 100644
--- a/Graphs/gGraphView.h
+++ b/Graphs/gGraphView.h
@@ -831,6 +831,9 @@ public:
     //! \brief Returns the current selected time range
     void GetXBounds(qint64 & st,qint64 & et);
 
+    //! \brief Returns the maximum time range bounds
+    void GetRXBounds(qint64 st, qint64 et);
+
     //! \brief Resets the time range to default for this day. Refreshing the display if refresh==true.
     void ResetBounds(bool refresh=true); //short group=0);
 
diff --git a/daily.cpp b/daily.cpp
index ca72b7f1..3688df44 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -295,25 +295,27 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     ui->evViewLCD->display(ews);
 
     GraphView->LoadSettings("Daily");
+    icon_on=new QIcon(":/icons/session-on.png");
+    icon_off=new QIcon(":/icons/session-off.png");
 
-    emptyToggleArea=new QLabel(this);
-    emptyToggleArea->setText("This may take a while...");
-    ui->graphToggleArea->addWidget(emptyToggleArea,1,Qt::AlignCenter);
-    emptyToggleArea->setVisible(false);
-    for (int i=0;i<GraphView->size();i++) {
-        QString title=(*GraphView)[i]->title();
-        QPushButton *btn=new QPushButton(title,this);
-        btn->setCheckable(true);
-        btn->setChecked((*GraphView)[i]->visible());
-        btn->setToolTip(tr("Show/Hide %1").arg(title));
-        btn->setVisible(false);
-        GraphToggles[title]=btn;
-        btn->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);
-        ui->graphToggleArea->addWidget(btn);
-        connect(btn,SIGNAL(toggled(bool)),this,SLOT(graphtogglebutton_toggled(bool)));
-    }
-    ui->graphToggleArea->addSpacerItem(new QSpacerItem(0,0,QSizePolicy::Expanding));
-    ui->graphVisibilityToggleArea->setVisible(false);
+//    emptyToggleArea=new QLabel(this);
+//    emptyToggleArea->setText("This may take a while...");
+//    ui->graphToggleArea->addWidget(emptyToggleArea,1,Qt::AlignCenter);
+//    emptyToggleArea->setVisible(false);
+//    for (int i=0;i<GraphView->size();i++) {
+//        QString title=(*GraphView)[i]->title();
+//        QPushButton *btn=new QPushButton(title,this);
+//        btn->setCheckable(true);
+//        btn->setChecked((*GraphView)[i]->visible());
+//        btn->setToolTip(tr("Show/Hide %1").arg(title));
+//        btn->setVisible(false);
+//        GraphToggles[title]=btn;
+//        btn->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);
+//        ui->graphToggleArea->addWidget(btn);
+//        connect(btn,SIGNAL(toggled(bool)),this,SLOT(graphtogglebutton_toggled(bool)));
+//    }
+//    ui->graphToggleArea->addSpacerItem(new QSpacerItem(0,0,QSizePolicy::Expanding));
+//    ui->graphVisibilityToggleArea->setVisible(false);
     ui->splitter->setVisible(false);
 
     // TODO: Add preference to hide do this for Widget Haters..
@@ -329,7 +331,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
         ui->weightSpinBox->setDecimals(3);
         ui->weightSpinBox->setSuffix(STR_UNIT_KG);
     }
-    GraphView->setCubeImage(images["sheep"]);
+    GraphView->setCubeImage(images["nodata"]);
     GraphView->setEmptyText(tr("No Data"));
 }
 
@@ -344,6 +346,8 @@ Daily::~Daily()
 
 //    delete splitter;
     delete ui;
+    delete icon_on;
+    delete icon_off;
 }
 void Daily::Link_clicked(const QUrl &url)
 {
@@ -688,14 +692,13 @@ void Daily::Load(QDate date)
     }
     //GraphView->redraw();
     //snapGV->redraw();
-    int graphsAvailable=0;
-    for (int i=0;i<GraphView->size();i++) {
-        QString title=(*GraphView)[i]->title();
-        bool empty=(*GraphView)[i]->isEmpty();
-        if (!empty) graphsAvailable++;
-        GraphToggles[title]->setVisible(!empty);
-    }
-    emptyToggleArea->setVisible(graphsAvailable==0);
+//    for (int i=0;i<GraphView->size();i++) {
+//        QString title=(*GraphView)[i]->title();
+//        bool empty=(*GraphView)[i]->isEmpty();
+//        if (!empty) graphsAvailable++;
+//        GraphToggles[title]->setVisible(!empty);
+//    }
+//    emptyToggleArea->setVisible(graphsAvailable==0);
 
     //ui->graphVisibilityToggleArea->setVisible(graphsAvailable>0);
 
@@ -707,16 +710,18 @@ void Daily::Load(QDate date)
     QString a;
     bool isBrick=false;
 
-    ui->graphVisibilityToggleArea->setVisible(true);
+    //ui->graphVisibilityToggleArea->setVisible(true);
 
-    if (graphsAvailable>0) {
-            GraphView->setCubeImage(images["sheep"]);
-            GraphView->setEmptyText(tr("Graphs Switched Off"));
-    } else {
-        GraphView->setCubeImage(images["nodata"]);
-        GraphView->setEmptyText(tr("No Data"));
-        emptyToggleArea->setText("No graph data available for this day");
-    }
+    updateGraphCombo();
+    int graphsAvailable=GraphView->visibleGraphs();
+//    if (graphsAvailable>0) {
+//            GraphView->setCubeImage(images["sheep"]);
+//            GraphView->setEmptyText(tr("Graphs Switched Off"));
+//    } else {
+//        GraphView->setCubeImage(images["nodata"]);
+//        GraphView->setEmptyText(tr("No Data"));
+//        emptyToggleArea->setText("No graph data available for this day");
+//    }
 
     if (cpap) {
         if (GraphView->isEmpty()) {
@@ -1705,3 +1710,101 @@ QString Daily::GetDetailsText()
     ui->webView->triggerPageAction(QWebPage::SelectEndOfDocument);
     return text;
 }
+
+void Daily::on_graphCombo_activated(int index)
+{
+    if (index<0)
+        return;
+
+    gGraph *g;
+    QString s;
+    s=ui->graphCombo->currentText();
+    bool b=!ui->graphCombo->itemData(index,Qt::UserRole).toBool();
+    ui->graphCombo->setItemData(index,b,Qt::UserRole);
+    if (b) {
+        ui->graphCombo->setItemIcon(index,*icon_on);
+    } else {
+        ui->graphCombo->setItemIcon(index,*icon_off);
+    }
+    g=GraphView->findGraph(s);
+    g->setVisible(b);
+
+    updateCube();
+    GraphView->updateScale();
+    GraphView->redraw();
+}
+void Daily::updateCube()
+{
+    //brick..
+    if ((GraphView->visibleGraphs()==0)) {
+        ui->toggleGraphs->setArrowType(Qt::UpArrow);
+        ui->toggleGraphs->setToolTip(tr("Show all graphs"));
+        ui->toggleGraphs->blockSignals(true);
+        ui->toggleGraphs->setChecked(true);
+        ui->toggleGraphs->blockSignals(false);
+
+        if (ui->graphCombo->count()>0) {
+            GraphView->setEmptyText(tr("No Graphs On!"));
+            GraphView->setCubeImage(images["sheep"]);
+
+        } else {
+            GraphView->setEmptyText("No Data");
+            GraphView->setCubeImage(images["nodata"]);
+        }
+    } else {
+        ui->toggleGraphs->setArrowType(Qt::DownArrow);
+        ui->toggleGraphs->setToolTip(tr("Hide all graphs"));
+        ui->toggleGraphs->blockSignals(true);
+        ui->toggleGraphs->setChecked(false);
+        ui->toggleGraphs->blockSignals(false);
+    }
+}
+
+
+void Daily::on_toggleGraphs_clicked(bool checked)
+{
+    gGraph *g;
+    QString s;
+    QIcon *icon=checked ? icon_off : icon_on;
+    for (int i=0;i<ui->graphCombo->count();i++) {
+        s=ui->graphCombo->itemText(i);
+        ui->graphCombo->setItemIcon(i,*icon);
+        ui->graphCombo->setItemData(i,!checked,Qt::UserRole);
+        g=GraphView->findGraph(s);
+        g->setVisible(!checked);
+    }
+    updateCube();
+    GraphView->updateScale();
+    GraphView->redraw();
+
+}
+
+void Daily::updateGraphCombo()
+{
+    ui->graphCombo->clear();
+    gGraph *g;
+
+    for (int i=0;i<GraphView->size();i++) {
+        g=(*GraphView)[i];
+        if (g->isEmpty()) continue;
+
+        if (g->visible()) {
+            ui->graphCombo->addItem(*icon_on,g->title(),true);
+        } else {
+            ui->graphCombo->addItem(*icon_off,g->title(),false);
+        }
+    }
+    ui->graphCombo->setCurrentIndex(0);
+    updateCube();
+}
+
+void Daily::on_zoomFullyOut_clicked()
+{
+    GraphView->ResetBounds(true);
+    GraphView->redraw();
+}
+
+void Daily::on_resetLayoutButton_clicked()
+{
+    GraphView->resetLayout();
+}
diff --git a/daily.h b/daily.h
index 81ce0457..1baea1d3 100644
--- a/daily.h
+++ b/daily.h
@@ -208,6 +208,14 @@ private slots:
         */
     void on_ZombieMeter_valueChanged(int value);
 
+    void on_graphCombo_activated(int index);
+
+    void on_toggleGraphs_clicked(bool checked);
+
+    void on_zoomFullyOut_clicked();
+
+    void on_resetLayoutButton_clicked();
+
 protected:
 
 private:
@@ -246,6 +254,9 @@ private:
         */
     void UpdateEventsTree(QTreeWidget * tree,Day *day);
 
+    void updateCube();
+    void updateGraphCombo();
+
     gGraph *PRD,*FRW,*GAHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2,
            *SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB,*OF, *THPR,
            *PLETHY,*TI,*TE, *RE, *IE, *TgMV, *AHI, *RDI;
@@ -271,10 +282,11 @@ private:
     MyScrollBar *scrollbar;
     QHBoxLayout *layout;
     QLabel *emptyToggleArea;
+    QIcon * icon_on;
+    QIcon * icon_off;
+
     bool ZombieMeterMoved;
     bool BookmarksChanged;
 };
 
 #endif // DAILY_H
-
-
diff --git a/daily.ui b/daily.ui
index 2847496f..5b6f86cd 100644
--- a/daily.ui
+++ b/daily.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>687</width>
-    <height>484</height>
+    <width>942</width>
+    <height>666</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <property name="spacing">
     <number>0</number>
    </property>
@@ -718,60 +718,122 @@
        </widget>
       </widget>
      </widget>
-     <widget class="QSplitter" name="splitter_4">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <widget class="QWidget" name="graphMainArea" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-         <horstretch>1</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+     <widget class="QWidget" name="">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <property name="spacing">
+        <number>0</number>
        </property>
-      </widget>
-      <widget class="QScrollArea" name="graphVisibilityToggleArea">
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>50</height>
-        </size>
-       </property>
-       <property name="verticalScrollBarPolicy">
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
-       <property name="horizontalScrollBarPolicy">
-        <enum>Qt::ScrollBarAlwaysOn</enum>
-       </property>
-       <property name="widgetResizable">
-        <bool>true</bool>
-       </property>
-       <widget class="QWidget" name="scrollAreaWidgetContents">
-        <property name="geometry">
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>82</width>
-          <height>33</height>
-         </rect>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_10">
-         <property name="spacing">
-          <number>2</number>
+       <item>
+        <widget class="QWidget" name="graphMainArea" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="margin">
-          <number>0</number>
+        </widget>
+       </item>
+       <item>
+        <widget class="QFrame" name="frame">
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
          </property>
-         <item>
-          <layout class="QHBoxLayout" name="graphToggleArea">
-           <property name="spacing">
-            <number>2</number>
-           </property>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </widget>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="spacing">
+           <number>2</number>
+          </property>
+          <property name="leftMargin">
+           <number>2</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>2</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QToolButton" name="zoomFullyOut">
+            <property name="toolTip">
+             <string>Zoom fully out</string>
+            </property>
+            <property name="text">
+             <string>100%</string>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="resetLayoutButton">
+            <property name="toolTip">
+             <string>Reset the graphs to uniform sizes</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="Resources.qrc">
+              <normaloff>:/icons/refresh.png</normaloff>:/icons/refresh.png</iconset>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Yay.. Empty space.. what for?</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QToolButton" name="toggleGraphs">
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+            <property name="arrowType">
+             <enum>Qt::DownArrow</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="graphCombo">
+            <property name="toolTip">
+             <string>Drop down this list to show/hide available graphs.</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
diff --git a/icons/sheep.png b/icons/sheep.png
index 341bc449..f9ae898b 100644
Binary files a/icons/sheep.png and b/icons/sheep.png differ