diff --git a/src/GoldenCheetah.cpp b/src/GoldenCheetah.cpp
index 2510c7de4..1eb940f15 100644
--- a/src/GoldenCheetah.cpp
+++ b/src/GoldenCheetah.cpp
@@ -208,7 +208,7 @@ GcWindow::paintEvent(QPaintEvent * /*event*/)
         // embossed...
         QRect shad = bar;
         shad.setY(bar.y()+2);
-        shad.setX(bar.x()+2);
+        //shad.setX(bar.x()+2);
         painter.setPen(QColor(255,255,255,180));
         painter.drawText(shad, title, Qt::AlignVCenter | Qt::AlignCenter);
 
diff --git a/src/HomeWindow.cpp b/src/HomeWindow.cpp
index 16bb3d99a..3461c495f 100644
--- a/src/HomeWindow.cpp
+++ b/src/HomeWindow.cpp
@@ -54,8 +54,8 @@ HomeWindow::HomeWindow(MainWindow *mainWindow, QString name, QString /* windowti
     title->setPalette(mypalette);
 #endif
 
-#ifdef Q_OS_MAC
-    CocoaInitializer cocoaInitializer; // we only need one
+#if 0
+    static CocoaInitializer cocoaInitializer; // we only need one
     styleSelector = new QtMacSegmentedButton (3, this);
     styleSelector->setTitle(0, "Tab");
     styleSelector->setTitle(1, "Scroll");
@@ -96,7 +96,7 @@ HomeWindow::HomeWindow(MainWindow *mainWindow, QString name, QString /* windowti
     tabbed->setContentsMargins(0,0,0,0);
     tabbed->setTabsClosable(false);
     tabbed->setPalette(palette);
-    tabbed->setDocumentMode(true);
+    tabbed->setDocumentMode(false);
 
     QTabBar *tb = tabbed->findChild<QTabBar*>(QLatin1String("qt_tabwidget_tabbar"));
     tb->setShape(QTabBar::RoundedSouth);
@@ -166,7 +166,7 @@ HomeWindow::HomeWindow(MainWindow *mainWindow, QString name, QString /* windowti
     winWidget->setMouseTracking(true); // to draw cursor
 
     currentStyle=2;
-#ifdef Q_OS_MAC
+#if 0
     styleSelector->setSelected(2);
 #else
     styleSelector->setCurrentIndex(2);
@@ -177,7 +177,7 @@ HomeWindow::HomeWindow(MainWindow *mainWindow, QString name, QString /* windowti
     connect(mainWindow, SIGNAL(configChanged()), this, SLOT(configChanged()));
     connect(tabbed, SIGNAL(currentChanged(int)), this, SLOT(tabSelected(int)));
     connect(tabbed, SIGNAL(tabCloseRequested(int)), this, SLOT(removeChart(int)));
-#ifdef Q_OS_MAC
+#if 0
     connect(styleSelector, SIGNAL(clicked(int,bool)), SLOT(styleChanged(int)));
 #else
     connect(styleSelector, SIGNAL(currentIndexChanged(int)), SLOT(styleChanged(int)));
diff --git a/src/HomeWindow.h b/src/HomeWindow.h
index ad7271fb0..49325a57a 100644
--- a/src/HomeWindow.h
+++ b/src/HomeWindow.h
@@ -90,7 +90,7 @@ class HomeWindow : public GcWindow
 
         // top bar
         QLabel *title;
-#ifdef Q_OS_MAC
+#if 0
         QtMacSegmentedButton *styleSelector;
 #else
         QComboBox *styleSelector;
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 1e8d2ab90..cf537575f 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -190,7 +190,8 @@ MainWindow::MainWindow(const QDir &home) :
     toolbar->setPalette(pal);
 #endif
     toolbar->setMovable(false);
-#else
+#endif
+#if 0
     QIcon tickIcon(":images/toolbar/main/tick.png");
     QPushButton *showControls = new QPushButton(tickIcon, "", this);
     showControls->setFixedWidth(10);
@@ -328,6 +329,7 @@ MainWindow::MainWindow(const QDir &home) :
 
     // TOOLBOX
     toolBox = new QToolBox(this);
+    toolBox->setAcceptDrops(true);
     toolBox->setStyleSheet("QToolBox::tab {"
 #if 0
                            "background-image: url(:images/aluToolBar.png);"
@@ -396,12 +398,13 @@ MainWindow::MainWindow(const QDir &home) :
     analysisControls->addWidget(analWindow->controls());
 
     // DOCK DRAWER ON MAC
-#ifdef Q_OS_MAC // on a mac the controls go into a dock drawer widget
+#if 0 // on a mac the controls go into a dock drawer widget
     // setup analysis window controls stack
     dock = new QDockWidget("Tools", this, Qt::Drawer);
     dock->hide();
     dock->setAllowedAreas(Qt::LeftDockWidgetArea);
     dock->setWidget(toolBox);
+    dock->setAcceptDrops(true);
 #endif
 
     // POPULATE TOOLBOX
@@ -434,9 +437,7 @@ MainWindow::MainWindow(const QDir &home) :
     views->setContentsMargins(0,0,0,0);
 
     // SPLITTER
-#ifndef Q_OS_MAC
    splitter->addWidget(toolBox);
-#endif
     splitter->addWidget(views);
     QVariant splitterSizes = appsettings->value(this, GC_SETTINGS_SPLITTER_SIZES); 
     if (splitterSizes != QVariant())