diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp
index 0c0b3932..cb1719d7 100644
--- a/Graphs/gSummaryChart.cpp
+++ b/Graphs/gSummaryChart.cpp
@@ -555,7 +555,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
 
 QString formatTime(EventDataType v, bool show_seconds=false, bool duration=false,bool show_12hr=false)
 {
-    int h=int(v+12);
+    int h=int(v);
 
     if (!duration) {
         h%=24;
@@ -567,7 +567,7 @@ QString formatTime(EventDataType v, bool show_seconds=false, bool duration=false
     char pm[3]={"am"};
 
     if (show_12hr) {
-        h>=12 ? pm[0]='p' : pm[0]='a'; // yes, inverted..
+        h>=12 ? pm[0]='p' : pm[0]='a';
         h %= 12;
         if (h==0) h=12;
 
diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp
index d8b12c0a..37f52990 100644
--- a/Graphs/gYAxis.cpp
+++ b/Graphs/gYAxis.cpp
@@ -255,14 +255,15 @@ gYAxisTime::~gYAxisTime()
 
 const QString gYAxisTime::Format(EventDataType v, int dp)
 {
-    int h=int(v+12) % 24;
+    int h=int(v) % 24;
     int m=int(v*60) % 60;
     int s=int(v*3600) % 60;
 
     char pm[3]={"am"};
 
     if (show_12hr) {
-        h>=12 ? pm[0]='a' : pm[0]='p';
+
+        h>=12 ? pm[0]='p' : pm[0]='a';
         h %= 12;
         if (h==0) h=12;
     } else {
diff --git a/daily.cpp b/daily.cpp
index 7f85d8af..552f713e 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -832,7 +832,7 @@ void Daily::Load(QDate date)
             } */
 
         //}
-        html+="</table><hr height=2><form method='get' action='sessions.php'><table cellpadding=0 cellspacing=0 border=0 width=100%>";
+        html+="</table><hr height=2><table cellpadding=0 cellspacing=0 border=0 width=100%>";
         QDateTime fd,ld;
         bool corrupted_waveform=false;
         QString tooltip;
@@ -849,7 +849,7 @@ void Daily::Load(QDate date)
                 QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find("BrokenWaveform");
                 tooltip=cpap->machine->GetClass()+" CPAP "+QString().sprintf("%2ih&nbsp;%2im&nbsp;%2is",h,m,s1);
                 if ((i!=(*s)->settings.end()) && i.value().toBool()) corrupted_waveform=true;
-                tmp.sprintf(("<tr><td align=left><input type=checkbox on_click='dosession("+QString::number((*s)->session())+")'><a href='cpap=%i' title='"+tooltip+"'>%08i</a></td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session(),(*s)->session());
+                tmp.sprintf(("<tr><td align=left><a href='cpap=%i' title='"+tooltip+"'>%08i</a></td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session(),(*s)->session());
                 html+=tmp;
             }
             //if (oxi) html+="<tr><td colspan=4><hr></td></tr>";
@@ -871,7 +871,7 @@ void Daily::Load(QDate date)
                 html+=tmp;
             }
         }
-        html+="</table><input type=submit name='submit'></form>";
+        html+="</table>";
         if (corrupted_waveform) {
             html+="<hr><div align=center><i>One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly.</i></div>";
         }