diff --git a/src/editing/common/mainwindow.cpp b/src/editing/common/mainwindow.cpp
index f80e078..6597607 100644
--- a/src/editing/common/mainwindow.cpp
+++ b/src/editing/common/mainwindow.cpp
@@ -63,7 +63,8 @@ int main(int argc, char** argv)
     BasePreview::initDrawers();
 
     window = new MainWindow();
-    window->showMaximized();
+    window->show();
+    //window->showMaximized();
     splash->finish(window);
 
     delete splash;
@@ -119,7 +120,8 @@ MainWindow::MainWindow(QWidget *parent) :
     _forms.append(_form_render);
 
     // TODO Decide this according to platform / screen size
-    ui->toolBar->hide();
+    //ui->toolBar->hide();
+    ui->tool_panel->hide();
     ui->menuBar->hide();
 
     scenerySetCustomDataCallback(MainWindow::guiSaveCallback, MainWindow::guiLoadCallback, this);
diff --git a/src/editing/common/mainwindow.ui b/src/editing/common/mainwindow.ui
index 720f880..b6744c8 100644
--- a/src/editing/common/mainwindow.ui
+++ b/src/editing/common/mainwindow.ui
@@ -19,6 +19,18 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
     <item>
      <widget class="QWidget" name="tool_panel" native="true">
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -302,7 +314,10 @@
    <addaction name="action_file_load"/>
    <addaction name="separator"/>
    <addaction name="action_explore"/>
+   <addaction name="action_quick_render"/>
    <addaction name="action_final_render"/>
+   <addaction name="separator"/>
+   <addaction name="action_about"/>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">