diff --git a/lib/read.py b/lib/read.py
index d45da67..9a39296 100644
--- a/lib/read.py
+++ b/lib/read.py
@@ -59,7 +59,6 @@ class EditDialog(QDialog, Ui_Dialog):
         styleSheet =  styleSheet.replace(
             '{phoneticFont}',self.preferences['phoneticFont']
         )
-        print(styleSheet)
         self.setupUi(self)
         #
         # Override UI
@@ -85,7 +84,8 @@ class EditDialog(QDialog, Ui_Dialog):
         self.scrollBtn.clicked.connect(self.scrollAction)
         self.nextBtn.clicked.connect(self.nextAction)
         self.prevBtn.clicked.connect(self.prevAction)
-        self.sessionBtn.clicked.connect(self.session.timerAction)
+        #self.sessionBtn.clicked.connect(self.session.timerAction)
+        self.sessionBtn.clicked.connect(self.timerAction)
         self.paraEdit.verticalScrollBar().valueChanged.connect(self.scrollSlot)
         self.defEdit.selectionChanged.connect(self.recursiveDef)
         #
@@ -105,6 +105,15 @@ class EditDialog(QDialog, Ui_Dialog):
     # slots
     #
     @pyqtSlot()
+    def timerAction(self):
+        if self.session.isActive(): # We are stopping
+            self.sessionBtn.setText("Start")
+        else:
+            self.sessionBtn.setText("Stop")
+        self.session.timerAction()
+        self.newParagraph.emit(self.section_id, self.block)
+        return
+    @pyqtSlot()
     def recursiveDef(self):
         cursor = self.defEdit.textCursor()
         selection = cursor.selectedText().strip()
@@ -430,7 +439,6 @@ class EditDialog(QDialog, Ui_Dialog):
         self.block += 1
         if self.block >= self.paraEdit.document().blockCount():
             self.nextSection()
-            return
         self.savePosition()
         self.newParagraph.emit(self.section_id, self.block)
         return
diff --git a/lib/session.py b/lib/session.py
index b80d051..3923f55 100644
--- a/lib/session.py
+++ b/lib/session.py
@@ -157,10 +157,8 @@ class SessionDialog(QDialog, Ui_Dialog):
     def timerAction(self) -> None:
         if self.activeBox.isChecked():  # we are stopping
             self.activeBox.setChecked(False)
-            self.sender().setText("Start")
             return
         self.timer.setInterval(1000)
-        self.sender().setText("Stop")
         self.activeBox.setChecked(True)
         return
 
@@ -263,3 +261,9 @@ class SessionDialog(QDialog, Ui_Dialog):
         if not query.exec():
             query_error(query)
         return
+
+    #
+    # End Slots
+    #
+    def isActive(self):
+        return self.activeBox.isChecked()