diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index b3f22233..28fc3714 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -604,6 +604,19 @@ void Daily::ReloadGraphs()
     graphView()->redraw();
 }
 
+void Daily::hideSpaceHogs()
+{
+    if (p_profile->appearance->calendarVisible()) {
+        ui->calendarFrame->setVisible(false);
+    }
+}
+void Daily::showSpaceHogs()
+{
+    if (p_profile->appearance->calendarVisible()) {
+        ui->calendarFrame->setVisible(true);
+    }
+}
+
 void Daily::on_calendar_currentPageChanged(int year, int month)
 {
     QDate d(year,month,1);
diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h
index 3968f930..29fc23e5 100644
--- a/sleepyhead/daily.h
+++ b/sleepyhead/daily.h
@@ -143,6 +143,8 @@ public:
     void setCalendarVisible(bool visible);
 
     void addBookmark(qint64 st, qint64 et, QString text);
+    void hideSpaceHogs();
+    void showSpaceHogs();
 
 private slots:
     void on_ReloadDay();
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 02b352ec..a39d60fd 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -1502,8 +1502,12 @@ void MainWindow::on_actionCheck_for_Updates_triggered()
     w->checkForUpdates();
 }
 
+bool toolbox_visible = false;
 void MainWindow::on_action_Screenshot_triggered()
 {
+    getDaily()->hideSpaceHogs();
+    toolbox_visible = ui->toolBox->isVisible();
+    ui->toolBox->hide();
     QTimer::singleShot(250, this, SLOT(DelayedScreenshot()));
 }
 void MainWindow::DelayedScreenshot()
@@ -1536,6 +1540,9 @@ void MainWindow::DelayedScreenshot()
     } else {
         Notify(tr("Screenshot saved to file \"%1\"").arg(QDir::toNativeSeparators(a)));
     }
+    getDaily()->showSpaceHogs();
+    ui->toolBox->setVisible(toolbox_visible);
+
 }
 
 void MainWindow::on_actionView_Oximetry_triggered()
diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp
index b90515db..a5027b60 100644
--- a/sleepyhead/overview.cpp
+++ b/sleepyhead/overview.cpp
@@ -227,8 +227,8 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
     if (p_profile->general->calculateRDI()) {
         bc->addSlice(CPAP_RERA, COLOR_RERA, ST_CPH);
     }
-    bc->addSlice(CPAP_UserFlag1, COLOR_UserFlag1, ST_CPH);
-    bc->addSlice(CPAP_UserFlag2, COLOR_UserFlag2, ST_CPH);
+//    bc->addSlice(CPAP_UserFlag1, COLOR_UserFlag1, ST_CPH);
+//    bc->addSlice(CPAP_UserFlag2, COLOR_UserFlag2, ST_CPH);
 
 
     AHI->AddLayer(bc);