diff --git a/main_window.py b/main_window.py
index 1ff3454..e6a4119 100644
--- a/main_window.py
+++ b/main_window.py
@@ -1,5 +1,5 @@
 import sys
-from PyQt5.QtWidgets import QFileDialog, QMainWindow, QMenuBar, QToolBar, QAction, QStatusBar
+from PyQt5.QtWidgets import QWidget, QFileDialog, QMainWindow, QMenuBar, QToolBar, QAction, QStatusBar, QSizePolicy
 from PyQt5.QtGui import QIcon, QKeySequence
 from PyQt5.QtCore import QSize, QSettings, Qt
 
@@ -52,6 +52,7 @@ class NixView(QMainWindow):
         
         self._quit_action = QAction(QIcon("./icons/quit.png"), "Quit", self)
         self._quit_action.setStatusTip("Close current file and quit")
+        self._quit_action.setShortcut(QKeySequence("Ctrl+q"))
         self._quit_action.triggered.connect(self.on_quit)
         
         self._plot_action = QAction(QIcon("./icons/nix_plot.png"), "Plot", self)
@@ -76,10 +77,16 @@ class NixView(QMainWindow):
 
         self._toolbar.addAction(self._file_open_action)
         self._toolbar.addAction(self._file_close_action)
-        self._toolbar.addAction(self._quit_action)
         self._toolbar.addSeparator()
         self._toolbar.addAction(self._plot_action)
         self._toolbar.addAction(self._table_action)
+        
+        empty = QWidget()
+        empty.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self._toolbar.addWidget(empty)
+        self._toolbar.addSeparator()
+        self._toolbar.addAction(self._quit_action)
+
         self.addToolBar(Qt.LeftToolBarArea, self._toolbar)
 
     def create_menu(self):
@@ -87,6 +94,7 @@ class NixView(QMainWindow):
         file_menu = menu.addMenu("&File")
         file_menu.addAction(self._file_open_action)
         file_menu.addAction(self._file_close_action)
+        file_menu.addSeparator()
         file_menu.addAction(self._quit_action)
         
         plot_menu = menu.addMenu("&Plot")