diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index 1ea0e9dd..fee2952f 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -2046,6 +2046,8 @@ void gGraphView::paintGL()
 
     if (width()<=0) return;
     if (height()<=0) return;
+    QTime time;
+    time.start();
 
     glClearColor(255,255,255,255);
     //glClearDepth(1);
@@ -2115,8 +2117,6 @@ void gGraphView::paintGL()
     }
 
     //int thr=m_idealthreads;
-    QTime time;
-    time.start();
 #ifdef ENABLED_THREADED_DRAWING
         for (int i=0;i<m_idealthreads;i++) {
             masterlock->acquire(1);
@@ -2160,8 +2160,14 @@ void gGraphView::paintGL()
     m_tooltip->paint();
     if (m_showsplitter && PROFILE["ShowDebug"].toBool()) {
         QString ss;
-        ss="PreDraw took "+QString::number(elapsed)+"ms";
-        AddTextQue(ss,width()-140,10,0,col,defaultfont);
+        int ela=time.elapsed();
+        ss="Debug Mode "+QString::number(ela)+"ms ("+QString::number(1000.0/float(ela),'f',1)+"fps)";
+        int w,h;
+        GetTextExtent(ss,w,h);
+        QColor col=Qt::white;
+        quads->add(width()-m_graphs[0]->marginRight(),0,width()-m_graphs[0]->marginRight(),w,width(),w,width(),0,col);
+        quads->draw();
+        AddTextQue(ss,width()+3,w/2,90,col,defaultfont);
         DrawTextQue();
     }
     //glDisable(GL_TEXTURE_2D);
@@ -2267,7 +2273,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
 
         if (m_button_down || ((py + h + graphSpacer) >= 0)) {
             if (m_button_down || ((y >= py) && (y < py + h))) {
-                if (m_button_down || (x >= titleWidth)) {
+                if (m_button_down || (x >= titleWidth+(20))) {
                     this->setCursor(Qt::ArrowCursor);
                     m_horiz_travel+=qAbs(x-m_lastxpos)+qAbs(y-m_lastypos);
                     m_lastxpos=x;
@@ -2277,6 +2283,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
 
                     m_graphs[i]->mouseMoveEvent(&e);
                 } else {
+                    //qDebug() << "Hovering over" << m_graphs[i]->title();
                     this->setCursor(Qt::OpenHandCursor);
                 }
             } else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) {
@@ -2309,7 +2316,7 @@ void gGraphView::mousePressEvent(QMouseEvent * event)
         if ((py + h + graphSpacer) >= 0) {
             if ((y >= py) && (y < py + h)) {
                 //qDebug() << "Clicked" << i;
-                if (x < titleWidth) { // clicked on title to drag graph..
+                if (x < titleWidth+20) { // clicked on title to drag graph..
                     m_graph_dragging=true;
                     m_graph_index=i;
                     m_sizer_point.setX(x);
diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h
index a554cd97..ade79365 100644
--- a/Graphs/gGraphView.h
+++ b/Graphs/gGraphView.h
@@ -341,6 +341,10 @@ public:
         m_marginleft=left; m_marginright=right;
         m_margintop=top; m_marginbottom=bottom;
     }
+    inline short marginLeft() { return m_marginleft; }
+    inline short marginRight() { return m_marginright; }
+    inline short marginTop() { return m_margintop; }
+    inline short marginBottom() { return m_marginbottom; }
 
     GLShortBuffer * lines();
     GLShortBuffer * backlines();
diff --git a/docs/channels.xml b/docs/channels.xml
index 6dfb4766..41274175 100644
--- a/docs/channels.xml
+++ b/docs/channels.xml
@@ -90,6 +90,7 @@ One id code per item
   <channel id="0x0803" class="data" scope="!day" name="Weight" details="Weight" label="Weight" unit="Kg" color="black"/>
   <channel id="0x0804" class="data" scope="!day" name="Height" details="Height" label="Height" unit="cm" color="blue"/>
   <channel id="0x0805" class="data" name="Bookmark" details="Session Bookmark" label="Bookmark" unit="duration" color="orange"/>
+  <channel id="0x0806" class="data" name="BMI" details="Body Mass Index" label="BMI" unit="kg/m2" color="orange"/>
   <channel id="0xd000" class="data" scope="!day" unique="true" name="Journal" details="Journal Notes" label="Journal" type="richtext"/>
  </group>
  <group name="PRS1">
diff --git a/overview.cpp b/overview.cpp
index a0056e59..8b4601b0 100644
--- a/overview.cpp
+++ b/overview.cpp
@@ -118,7 +118,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     weight->addSlice("Weight",QColor("black"),ST_SETAVG);
     WEIGHT->AddLayer(weight);
 
-    bmi=new SummaryChart("B.M.I.",GT_LINE);
+    bmi=new SummaryChart("BMI",GT_LINE);
     bmi->setMachineType(MT_JOURNAL);
     bmi->addSlice("BMI",QColor("dark blue"),ST_SETAVG);
     BMI->AddLayer(bmi);