diff --git a/logFileModel.py b/logFileModel.py
index 6247f52..f811f9d 100644
--- a/logFileModel.py
+++ b/logFileModel.py
@@ -12,6 +12,12 @@ class LogFileModel:
     def __init__(self, file):
         self._file = file
 
+    def get_tab_name(self):
+        file_name = os.path.basename(self._file)
+        if len(file_name) > 35:
+            file_name = file_name[:15] + "..." + file_name[-15:]
+        return file_name
+
     def read_range(self, start_byte: int, end_byte: int):
         with self._lock:
             with open(self._file, 'rb') as f:
diff --git a/main.py b/main.py
index af29b81..9af58ad 100644
--- a/main.py
+++ b/main.py
@@ -30,9 +30,6 @@ class MainWindow(QMainWindow):
 
     def create_main_tool_bar(self):
         result = QToolBar("main toolbar")
-        follow_file = QCheckBox("Follow File")
-        follow_file.toggled.connect(self.on_follow_file_changed)
-        result.addWidget(follow_file)
 
         result.addWidget(QLabel("Font Size:"))
         font_size = QComboBox(result)
@@ -54,16 +51,16 @@ class MainWindow(QMainWindow):
     def create_tabs(self) -> QTabWidget:
         tabs = QTabWidget()
         tabs.setTabsClosable(True)
+        tabs.tabCloseRequested.connect(lambda index: tabs.removeTab(index) )
 
-
-        #model = LogFileModel("/home/andi/ws/performanceDb/data/production/logs_2018-09-06_2018-09-06.csv")
         model = LogFileModel("/home/andi/ws/ravenlog/example.log")
         big_text = BigText(model, self.settings)
-        tabs.addTab(big_text, "small")
+        tabs.addTab(big_text, model.get_tab_name())
+
 
         model = LogFileModel("/home/andi/ws/performanceDb/data/production/logs_2018-09-06_2018-09-06.csv")
         big_text = BigText(model, self.settings)
-        tabs.addTab(big_text, "big")
+        tabs.addTab(big_text, model.get_tab_name())
 
         return tabs