diff --git a/TermTk/TTkGui/theme.py b/TermTk/TTkGui/theme.py
index fe778604..5d647d99 100644
--- a/TermTk/TTkGui/theme.py
+++ b/TermTk/TTkGui/theme.py
@@ -156,16 +156,19 @@ class TTkTheme():
 
     ::
 
-          ┌──────╔══════╗──────┬──────┐      ┌─┌──────╔══════╗──────┬──────┐─┐
-          │Label1║Label2║Label3│Label4│      │◀│Label1║Label2║Label3│Label4│▶│
-        ╞═╧══════╩══════╩══════╧══════╧════╡ ╞═╧══════╩══════╩══════╧══════╧═╡
-          ┌──────╔══════╗──────┬──────┐      ╭─┌──────╔══════╗──────┬──────┐─╮
-          │Label1║Label2║Label3│Label4│      │◀│Label1║Label2║Label3│Label4│▶│
-        ╞════════╩══════╩══════════════════╡ ╞════════╩══════╩═══════════════╡
+          ┌──────╔══════╗──────┬──────┐           ┌─┌──────╔══════╗──────┬──────┐─┐
+          │Label1║Label2║Label3│Label4│           │◀│Label1║Label2║Label3│Label4│▶│
+        ╞═╧══════╩══════╩══════╧══════╧════╡      ╞═╧══════╩══════╩══════╧══════╧═╡
+          ┌──────╔══════╗──────┬──────┐           ╭─┌──────╔══════╗──────┬──────┐─╮
+          │Label1║Label2║Label3│Label4│           │◀│Label1║Label2║Label3│Label4│▶│
+        ╞════════╩══════╩══════════════════╡      ╞════════╩══════╩═══════════════╡
         # Menu Prototype:
-        ╭──┌──────╔══════╗──────┬──────┐   ╭──┬─┌──────╔══════╗──────┬──────┐─╮
-        │⣿⣿│Label1║Label2║Label3│Label4│   │⣿⣿│◀│Label1║Label2║Label3│Label4│▶│
-        ╞═════════╩══════╩═══════════════╡ ╞══╧════════╩══════╩═══════════════╡
+        ╭──┌──────╔══════╗──────┬──────┐          ╭──┬─┌──────╔══════╗──────┬──────┐─╮
+        │XX│Label1║Label2║Label3│Label4│          │XX│◀│Label1║Label2║Label3│Label4│▶│
+        ╞═════════╩══════╩═══════════════╡        ╞══╧════════╩══════╩═══════════════╡
+              ┌──────╔══════╗──────┬──────┐             ╭─┌──────╔══════╗──────┬──────┐─╮
+         XX YY│Label1║Label2║Label3│Label4│JJ KK   XX YY│◀│Label1║Label2║Label3│Label4│▶│JJ KK
+        ╞════════════╩══════╩═══════════════════╡ ╞═════╧════════╩══════╩═══════════════╧═════╡
           ┌──────┲━━━━━━┱──────┬──────┐
           │Label1┃Label2┃Label3│Label4│
         ┝━┷━━━━━━┻━━━━━━┻━━━━━━┷━━━━━━┷━━━━┥
diff --git a/TermTk/TTkWidgets/menubar.py b/TermTk/TTkWidgets/menubar.py
index 276815f6..7c0b29d3 100644
--- a/TermTk/TTkWidgets/menubar.py
+++ b/TermTk/TTkWidgets/menubar.py
@@ -49,7 +49,7 @@ class _TTkMenuListWidget(TTkListWidget):
                 return True
             elif evt.key == TTkK.Key_Right:
                 if self._highlighted and \
-                   isinstance(self._highlighted,_TTkMenuButton) and \
+                   isinstance(self._highlighted,TTkMenuButton) and \
                    self._highlighted._menu:
                     self._highlighted.menuButtonEvent()
                 return True
@@ -65,11 +65,11 @@ class _TTkMenuSpacer(TTkAbstractListItem):
     def paintEvent(self):
         self._canvas.drawText(pos=(0,0), text="-"*self.width())
 
-class _TTkMenuButton(TTkAbstractListItem):
+class TTkMenuButton(TTkAbstractListItem):
     __slots__ = ('_border', '_borderColor', '_shortcut', '_menu', 'menuButtonClicked')
     def __init__(self, *args, **kwargs):
         TTkAbstractListItem.__init__(self, *args, **kwargs)
-        self._name = kwargs.get('name' , '_TTkMenuButton' )
+        self._name = kwargs.get('name' , 'TTkMenuButton' )
         # signals
         self.menuButtonClicked = pyTTkSignal(TTkButton)
         self._color = kwargs.get('color', TTkCfg.theme.menuButtonColor )
@@ -90,7 +90,7 @@ class _TTkMenuButton(TTkAbstractListItem):
         self.listItemClicked.connect(self.menuButtonEvent)
 
     def addMenu(self, text):
-        button = _TTkMenuButton(text=text, borderColor=self._borderColor, border=False)
+        button = TTkMenuButton(text=text, borderColor=self._borderColor, border=False)
         button.menuButtonClicked.connect(self._menuCallback)
         self._menu.append(button)
         return button
@@ -196,7 +196,7 @@ class TTkMenuLayout(TTkHBoxLayout):
         self.update()
 
     def addMenu(self, text, alignment=TTkK.LEFT_ALIGN):
-        button = _TTkMenuButton(text=text, borderColor=self._borderColor, border=True)
+        button = TTkMenuButton(text=text, borderColor=self._borderColor, border=True)
         if  alignment == TTkK.LEFT_ALIGN:
             self._itemsLeft.addWidget(button)
         elif alignment == TTkK.CENTER_ALIGN:
diff --git a/demo/demo.py b/demo/demo.py
index 2620890a..90219ae6 100755
--- a/demo/demo.py
+++ b/demo/demo.py
@@ -58,6 +58,7 @@ def demoShowcase(root=None, border=True):
 
     listMenu.addItem(f"Test")
     tabTest = ttk.TTkTabWidget(parent=mainFrame, border=False, visible=False)
+    tabTest.addTab(ttk.TTkLogViewer(), " LogViewer ")
     tabTest.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.1"), " Label 1.1 ")
     tabTest.addTab(ttk.TTkTestWidget(border=True, title="Frame1.2"), " Label Test 1.2 ")
 
@@ -116,7 +117,7 @@ def demoShowcase(root=None, border=True):
 
     listMenu.textClicked.connect(_listCallback)
 
-    listMenu.setCurrentRow(1)
+    listMenu.setCurrentRow(0)
 
     return splitter
 
diff --git a/demo/showcase/tab.py b/demo/showcase/tab.py
index e662dc64..a1b6bf0f 100755
--- a/demo/showcase/tab.py
+++ b/demo/showcase/tab.py
@@ -29,12 +29,16 @@ import TermTk as ttk
 
 def demoTab(root= None):
     tabWidget1 = ttk.TTkTabWidget(parent=root, border=True)
-    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.1"), "Label 1.1")
-    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.2"), "Label 1.2")
-    tabWidget1.addTab(ttk.TTkTestWidget(border=True, title="Frame1.3"), "Label Test 1.3")
-    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.4"), "Label 1.4")
-    tabWidget1.addTab(ttk.TTkTestWidget(border=True, title="Frame1.5"), "Label Test 1.5")
-    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.6"), "Label 1.6")
+    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.1"),  "Label 1.1")
+    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.2"),  "Label 1.2")
+    tabWidget1.addTab(ttk.TTkTestWidget(     border=True, title="Frame1.3"),  "Label Test 1.3")
+    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.4"),  "Label 1.4")
+    tabWidget1.addTab(ttk.TTkTestWidget(     border=True, title="Frame1.5"),  "Label Test 1.5")
+    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.6"),  "Label 1.6")
+    tabWidget1.addTab(ttk.TTkTestWidget(     border=True, title="Frame1.7"),  "Label Test 1.7")
+    tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.8"),  "Label 1.8")
+    #tabWidget1.addTab(ttk.TTkTestWidget(     border=True, title="Frame1.9"),  "Label Test 1.9")
+    #tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.10"), "Label 1.10")
     return tabWidget1
 
 def main():