diff --git a/__main__.py b/__main__.py
index 920d609..c2ff798 100755
--- a/__main__.py
+++ b/__main__.py
@@ -32,35 +32,31 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
         self.current_textEdit = None
         self.current_textEdit_parent = None
 
-        # Toolbar setup
+        # Book Toolbar
         self.BookToolBar.hide()
         fullscreenButton = QtWidgets.QAction(
             QtGui.QIcon.fromTheme('view-fullscreen'), 'Fullscreen', self)
         self.BookToolBar.addAction(fullscreenButton)
         fullscreenButton.triggered.connect(self.set_fullscreen)
 
-        # LibraryToolBar buttons
+        # Library Toolbar
         addButton = QtWidgets.QAction(QtGui.QIcon.fromTheme('add'), 'Add book', self)
         deleteButton = QtWidgets.QAction(QtGui.QIcon.fromTheme('remove'), 'Delete book', self)
         settingsButton = QtWidgets.QAction(QtGui.QIcon.fromTheme('settings'), 'Settings', self)
-        addButton.triggered.connect(self.create_tab_class)
+        addButton.triggered.connect(self.open_file)
+        settingsButton.triggered.connect(self.create_tab_class)
 
         self.LibraryToolBar.addAction(addButton)
         self.LibraryToolBar.addAction(deleteButton)
         self.LibraryToolBar.addSeparator()
         self.LibraryToolBar.addAction(settingsButton)
 
-        self.exit_shortcut = QtWidgets.QShortcut(QtGui.QKeySequence('Escape'), self.textEdit)
-        self.exit_shortcut.activated.connect(self.testfsoff)
-
         # Toolbar switching
         self.tabWidget.currentChanged.connect(self.toolbar_switch)
 
         # Tab closing
         self.tabWidget.tabCloseRequested.connect(self.close_tab_class)
 
-        self.pushButton.clicked.connect(self.testfs)
-
     def create_tab_class(self):
         # TODO
         # Shift focus to tab if it's already open instead of creating
@@ -70,6 +66,14 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
         this_tab = Tabs(self, 'TitleText')
         this_tab.create_tab()
 
+    def open_file(self):
+        # TODO
+        # Maybe expand this to traverse directories recursively
+        home_dir = os.path.expanduser('~')
+        my_file = QtWidgets.QFileDialog.getOpenFileNames(
+            self, 'Open file', home_dir, "eBooks (*.epub *.mobi *.txt)")
+        print(my_file[0])
+
     def close_tab_class(self, tab_index):
         this_tab = Tabs(self, None)
         this_tab.close_tab(tab_index)
@@ -92,11 +96,13 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
 
         self.current_textEdit.setWindowFlags(QtCore.Qt.Window)
         self.current_textEdit.setWindowState(QtCore.Qt.WindowFullScreen)
+        self.hide()
         self.current_textEdit.show()
 
     def set_normalsize(self):
         self.current_textEdit.setWindowState(QtCore.Qt.WindowNoState)
         self.current_textEdit.setWindowFlags(QtCore.Qt.Widget)
+        self.show()
         self.current_textEdit.show()
 
 
@@ -121,7 +127,7 @@ class Tabs:
     def close_tab(self, tab_index):
         tab_title = self.parent_window.tabWidget.tabText(tab_index).replace('&', '')
         print(self.parent_window.tabs[tab_title])
-        # self.parent_window.tabWidget.removeTab(tab_index)
+        self.parent_window.tabWidget.removeTab(tab_index)
 
 
 def main():
diff --git a/mainwindow.py b/mainwindow.py
index 4fc6ca9..4c030c2 100644
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(800, 600)
+        MainWindow.resize(1064, 724)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.gridLayout = QtWidgets.QGridLayout(self.centralwidget)
@@ -27,12 +27,6 @@ class Ui_MainWindow(object):
         self.gridLayout_2.setObjectName("gridLayout_2")
         self.verticalLayout = QtWidgets.QVBoxLayout()
         self.verticalLayout.setObjectName("verticalLayout")
-        self.pushButton = QtWidgets.QPushButton(self.tab)
-        self.pushButton.setObjectName("pushButton")
-        self.verticalLayout.addWidget(self.pushButton)
-        self.textEdit = QtWidgets.QTextEdit(self.tab)
-        self.textEdit.setObjectName("textEdit")
-        self.verticalLayout.addWidget(self.textEdit)
         self.gridLayout_2.addLayout(self.verticalLayout, 0, 0, 1, 1)
         self.tabWidget.addTab(self.tab, "")
         self.horizontalLayout.addWidget(self.tabWidget)
@@ -57,7 +51,6 @@ class Ui_MainWindow(object):
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
         MainWindow.setWindowTitle(_translate("MainWindow", "Lector"))
-        self.pushButton.setText(_translate("MainWindow", "PushButton"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Library"))
         self.LibraryToolBar.setWindowTitle(_translate("MainWindow", "toolBar"))
         self.BookToolBar.setWindowTitle(_translate("MainWindow", "toolBar_2"))
diff --git a/resources/main.ui b/resources/main.ui
index 3851846..e65fde9 100644
--- a/resources/main.ui
+++ b/resources/main.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>1064</width>
+    <height>724</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,18 +31,7 @@
          </attribute>
          <layout class="QGridLayout" name="gridLayout_2">
           <item row="0" column="0">
-           <layout class="QVBoxLayout" name="verticalLayout">
-            <item>
-             <widget class="QPushButton" name="pushButton">
-              <property name="text">
-               <string>PushButton</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QTextEdit" name="textEdit"/>
-            </item>
-           </layout>
+           <layout class="QVBoxLayout" name="verticalLayout"/>
           </item>
          </layout>
         </widget>