diff --git a/manifest b/manifest
index 39075ae..db80fae 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixed\sOSX\slinker\serrors
-D 2015-08-22T11:40:53.954
+C Improved\sthe\slook\sof\sthe\sUI\son\sOSX
+D 2015-08-22T14:13:47.025
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -231,7 +231,7 @@ F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac
 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp dfa81f94f04e418bdd22985b898855733842d496
+F src/MainWindow.cpp 3f9e9e43f4cb45a4f55e719b1b282fbba1a79dff
 F src/MainWindow.h f4cffbe4d360d30aa2eeaa25fc6d50d0a39c617f
 F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac
 F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
@@ -256,11 +256,11 @@ F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
 F ui/CommitDialog.ui 1e5dafa742e9ae07ec937bcda8cda3297ddc6199
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/FslSettingsDialog.ui eb3d4cb764cab90b01e82922237d8c42d6ce1749
-F ui/MainWindow.ui f9774e6dddb9462d8072bffd6c511bee7f470b9d
+F ui/MainWindow.ui e2a18caa7482b3ee0dff477592cdc9574b35fe4f
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
-P 29c6a41585bad0bf9f506ea3ba148bb3ad3a2dca
-R f065b80b55df778018b7b500e5349819
+P d9a15280f162ca92b6d65c41033d43890d306779
+R 96b148030fa554a93fc5ee03b6e5779e
 U kostas
-Z a3febc8e619dfe3ca27ff0716f9eb2d6
+Z 0c04b2ca46fc335ab2b71b43a22070ef
diff --git a/manifest.uuid b/manifest.uuid
index 26f1d24..5fcbdd2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d9a15280f162ca92b6d65c41033d43890d306779
\ No newline at end of file
+08496c56dbe49392c45a50d4bac5621d61b96e84
\ No newline at end of file
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 10f35ad..cd49cd1 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -263,6 +263,16 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
 		a->setIconVisibleInMenu(false);
 	foreach(QAction *a, ui->menuFile->actions())
 		a->setIconVisibleInMenu(false);
+
+	// For some unknown reason on OSX the treeview gets a focus rect. So disable it
+	ui->workspaceTreeView->setAttribute(Qt::WA_MacShowFocusRect, false);
+
+	// Tighen-up the sizing of the main widgets to look slightly more consistent with the OSX style
+	ui->centralWidget->layout()->setContentsMargins(0, 0, 0, 3);
+	ui->workspaceTreeView->setFrameShape(QFrame::NoFrame);
+	ui->fileTableView->setFrameShape(QFrame::NoFrame);
+	ui->splitterVertical->setHandleWidth(1);
+	ui->splitterHorizontal->setHandleWidth(1);
 #endif
 
 	abortShortcut = new QShortcut(QKeySequence("Escape"), this);
@@ -284,7 +294,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
 
 	// Create SearchBox
 	searchBox = new SearchBox(this);
-	searchBox->setPlaceholderText(tr("Filter (%0)").arg(searchShortcut->key().toString()));
+	searchBox->setPlaceholderText(tr("Filter (%0)").arg(searchShortcut->key().toString(QKeySequence::NativeText)));
 	searchBox->setMaximumWidth(450);
 	ui->mainToolBar->addWidget(searchBox);
 
diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui
index 63a9459..a352b44 100644
--- a/ui/MainWindow.ui
+++ b/ui/MainWindow.ui
@@ -38,7 +38,7 @@
      <number>4</number>
     </property>
     <item>
-     <widget class="QSplitter" name="splitter_2">
+     <widget class="QSplitter" name="splitterVertical">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
         <horstretch>0</horstretch>
@@ -48,7 +48,7 @@
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
-      <widget class="QSplitter" name="splitter">
+      <widget class="QSplitter" name="splitterHorizontal">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>