diff --git a/ControlPage.py b/ControlPage.py
index fb519c288..74fd9afc8 100644
--- a/ControlPage.py
+++ b/ControlPage.py
@@ -1030,10 +1030,9 @@ def wcsChange(self):
 # Control Page
 #===============================================================================
 class ControlPage(CNCRibbon.Page):
-	"""CNC communication and control"""
-
-	_name_ = N_("Control")
-	_icon_ = "control"
+	__doc__ = _("CNC communication and control")
+	_name_  = N_("Control")
+	_icon_  = "control"
 
 	#----------------------------------------------------------------------
 	# Add a widget in the widgets list to enable disable during the run
diff --git a/EditorPage.py b/EditorPage.py
index a6dd5966b..02ee4b653 100644
--- a/EditorPage.py
+++ b/EditorPage.py
@@ -522,10 +522,9 @@ def __init__(self, master, app):
 # Editor Page
 #===============================================================================
 class EditorPage(CNCRibbon.Page):
-	"""GCode editor"""
-
-	_name_ = N_("Editor")
-	_icon_ = "edit"
+	__doc__ = _("GCode editor")
+	_name_  = N_("Editor")
+	_icon_  = "edit"
 
 	#----------------------------------------------------------------------
 	# Add a widget in the widgets list to enable disable during the run
diff --git a/FilePage.py b/FilePage.py
index 8b17022f6..f25cfbe7b 100644
--- a/FilePage.py
+++ b/FilePage.py
@@ -282,9 +282,9 @@ def saveConfig(self):
 # File Page
 #===============================================================================
 class FilePage(CNCRibbon.Page):
-	"""File I/O and configuration"""
-	_name_ = N_("File")
-	_icon_ = "new"
+	__doc__ = _("File I/O and configuration")
+	_name_  = N_("File")
+	_icon_  = "new"
 
 	#----------------------------------------------------------------------
 	# Add a widget in the widgets list to enable disable during the run
diff --git a/ProbePage.py b/ProbePage.py
index 34db8ef78..c228d69b2 100644
--- a/ProbePage.py
+++ b/ProbePage.py
@@ -1053,10 +1053,9 @@ def change(self, event=None):
 # Probe Page
 #===============================================================================
 class ProbePage(CNCRibbon.Page):
-	"""Probe configuration and probing"""
-
-	_name_ = "Probe"
-	_icon_ = "measure"
+	__doc__ = _("Probe configuration and probing")
+	_name_  = "Probe"
+	_icon_  = "measure"
 
 	#----------------------------------------------------------------------
 	# Add a widget in the widgets list to enable disable during the run
diff --git a/TerminalPage.py b/TerminalPage.py
index f52162c4f..57c5bb0b4 100644
--- a/TerminalPage.py
+++ b/TerminalPage.py
@@ -165,8 +165,9 @@ def copy(self, event=None):
 # Terminal Page
 #===============================================================================
 class TerminalPage(CNCRibbon.Page):
-	_name_ = "Terminal"
-	_icon_ = "terminal"
+	__doc__ = _("Serial Terminal")
+	_name_  = "Terminal"
+	_icon_  = "terminal"
 
 	#----------------------------------------------------------------------
 	# Add a widget in the widgets list to enable disable during the run
diff --git a/ToolsPage.py b/ToolsPage.py
index bda75759d..64565981b 100644
--- a/ToolsPage.py
+++ b/ToolsPage.py
@@ -1220,10 +1220,9 @@ def rename(self, event=None):
 # Tools Page
 #===============================================================================
 class ToolsPage(CNCRibbon.Page):
-	"""GCode manipulation tools and user plugins"""
-
-	_name_ = N_("Tools")
-	_icon_ = "tools"
+	__doc__ = _("GCode manipulation tools and user plugins")
+	_name_  = N_("Tools")
+	_icon_  = "tools"
 
 	#----------------------------------------------------------------------
 	# Add a widget in the widgets list to enable disable during the run
diff --git a/bCNC.pot b/bCNC.pot
index ef6c0cfa5..7125ed36c 100644
--- a/bCNC.pot
+++ b/bCNC.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-01 22:17+CET\n"
+"POT-Creation-Date: 2016-01-01 22:33+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -432,7 +432,11 @@ msgstr ""
 msgid "Set spindle RPM"
 msgstr ""
 
-#: ControlPage.py:1035
+#: ControlPage.py:1033
+msgid "CNC communication and control"
+msgstr ""
+
+#: ControlPage.py:1034
 msgid "Control"
 msgstr ""
 
@@ -740,7 +744,11 @@ msgstr ""
 msgid "Reverse direction of selected gcode blocks"
 msgstr ""
 
-#: EditorPage.py:527
+#: EditorPage.py:525
+msgid "GCode editor"
+msgstr ""
+
+#: EditorPage.py:526
 msgid "Editor"
 msgstr ""
 
@@ -861,6 +869,10 @@ msgstr ""
 msgid "Open/Close serial port"
 msgstr ""
 
+#: FilePage.py:285
+msgid "File I/O and configuration"
+msgstr ""
+
 #: ProbePage.py:23
 msgid "G38.2 stop on contact else error"
 msgstr ""
@@ -1219,6 +1231,10 @@ msgstr ""
 msgid "Invalid tool height or not calibrated"
 msgstr ""
 
+#: ProbePage.py:1056
+msgid "Probe configuration and probing"
+msgstr ""
+
 #: Ribbon.py:481
 msgid "Open file [Ctrl-O]"
 msgstr ""
@@ -1483,6 +1499,10 @@ msgstr ""
 msgid "$ Display build information of Grbl"
 msgstr ""
 
+#: TerminalPage.py:168
+msgid "Serial Terminal"
+msgstr ""
+
 #: ToolsPage.py:469
 msgid "Units (inches)"
 msgstr ""
@@ -1793,7 +1813,11 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: ToolsPage.py:1225
+#: ToolsPage.py:1223
+msgid "GCode manipulation tools and user plugins"
+msgstr ""
+
+#: ToolsPage.py:1224
 msgid "Tools"
 msgstr ""