diff --git a/demo/showcase/formwidgets02.py b/demo/showcase/formwidgets02.py
index 906fe3d0..9aa66756 100755
--- a/demo/showcase/formwidgets02.py
+++ b/demo/showcase/formwidgets02.py
@@ -35,10 +35,10 @@ def demoFormWidgets(root=None):
     win_form1_grid_layout = ttk.TTkGridLayout(columnMinWidth=1)
     frame = ttk.TTkFrame(parent=root, layout=win_form1_grid_layout, border=0)
 
-    win_form1_grid_layout.addWidget(_b1 := ttk.TTkButton(text='Button 1'),0,0)
-    win_form1_grid_layout.addWidget(_b2 := ttk.TTkButton(text='Button 2', border=True),1,0)
-    win_form1_grid_layout.addWidget(_b3 := ttk.TTkButton(text='Checkable 1', checkable=True, maxHeight=3),0,2)
-    win_form1_grid_layout.addWidget(_b4 := ttk.TTkButton(text='Checkable 2', checkable=True, border=True, maxHeight=3),1,2)
+    win_form1_grid_layout.addWidget(_b1 := ttk.TTkButton(text='Button 1', border=True, maxHeight=3),0,0)
+    win_form1_grid_layout.addWidget(_b2 := ttk.TTkButton(text='Button 2'),1,0)
+    win_form1_grid_layout.addWidget(_b3 := ttk.TTkButton(text='Checkable 1', checkable=True, border=True),0,2)
+    win_form1_grid_layout.addWidget(_b4 := ttk.TTkButton(text='Checkable 2', checkable=True),1,2)
 
     win_form1_grid_layout.addWidget(_en_dis_cb := ttk.TTkCheckbox(text=" en/dis", checked=True, maxWidth=11),1,3)
     _en_dis_cb.clicked.connect(_b1.setEnabled)
diff --git a/docs/source/info/features/index.rst b/docs/source/info/features/index.rst
index bb84768e..f751ae15 100644
--- a/docs/source/info/features/index.rst
+++ b/docs/source/info/features/index.rst
@@ -3,6 +3,8 @@
 Features
 ========
 
+.. image:: https://github.com/ceccopierangiolieugenio/pyTermTk/assets/8876552/96d2a1f0-721b-4988-b4cf-63e11fa31610
+
 Main features
 -------------
 
diff --git a/docs/source/info/features/widgets.rst b/docs/source/info/features/widgets.rst
index a8bea2d5..0cc91991 100644
--- a/docs/source/info/features/widgets.rst
+++ b/docs/source/info/features/widgets.rst
@@ -45,21 +45,23 @@ Specialised Widgets
 Pickers
 -------
 .. image:: https://github.com/ceccopierangiolieugenio/pyTermTk/assets/8876552/35de8317-1ee6-4dad-9c46-320d0692c393
-* Text Picker
+* Text Picker :class:`~TermTk.TTkWidgets.TTkPickers.textpicker.TTkTextPicker`
 
 .. image:: https://github.com/ceccopierangiolieugenio/pyTermTk/assets/8876552/0388f4a0-1a93-4d57-9a77-c7e43422fedb
-* File Picker
+* File Picker :class:`~TermTk.TTkWidgets.TTkPickers.filepicker.TTkFileButtonPicker`
 
 .. image:: https://github.com/ceccopierangiolieugenio/pyTermTk/assets/8876552/9a61baf3-f151-49a6-bde0-ace02eb9008e
-* Color Picker
+* Color Picker :class:`~TermTk.TTkWidgets.TTkPickers.colorpicker.TTkColorButtonPicker`
+
+* Message Box :class:`~TermTk.TTkWidgets.TTkPickers.messagebox.TTkMessageBox`
 
 .. _widgets-layout:
 
 Layout
 ------
 
-* Frame
-* Resizable Frame
+* Frame :class:`~TermTk.TTkWidgets.frame.TTkFrame`
+* Resizable Frame :class:`~TermTk.TTkWidgets.resizableframe.TTkResizableFrame`
 * Window :class:`~TermTk.TTkWidgets.window.TTkWindow`
-* Splitter
-* Scroll Area
\ No newline at end of file
+* Splitter :class:`~TermTk.TTkWidgets.splitter.TTkSplitter`
+* Scroll Area :class::`~TermTk.TTkWidgets.scrollarea.TTkScrollArea`
\ No newline at end of file