diff --git a/Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox b/Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox
index 8351db4f16..481dc52e49 100755
--- a/Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox
+++ b/Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox
@@ -1,18 +1,17 @@
 /**
-\page $(plugin-target) $(plugin-name)
+\page $(plugin-target) The $(plugin-name)
 
 \imageMacro{icon.png,"Icon of $(plugin-name)",2.00}
 
-Available sections:
-  - \ref $(plugin-target)Overview
+\tableofcontents
 
-\section $(plugin-target)Overview
+\section $(plugin-target)Overview Overview
 Describe the features of your awesome plugin here
 <ul>
 <li>Increases productivity
 <li>Creates beautiful images
 <li>Generates PhD thesis
 <li>Brings world peace
 </ul>
 
 */
diff --git a/CMake/QBundleTemplate/documentation/Manual/Manual.dox b/CMake/QBundleTemplate/documentation/Manual/Manual.dox
index 7b764026fa..21d82fb187 100755
--- a/CMake/QBundleTemplate/documentation/Manual/Manual.dox
+++ b/CMake/QBundleTemplate/documentation/Manual/Manual.dox
@@ -1,13 +1,12 @@
 /**
-\page @PLUGIN_ID@ @PLUGIN_NAME@
+\page @PLUGIN_ID@ The @PLUGIN_NAME@
 
 \imageMacro{icon.png,"Icon of @PLUGIN_NAME@",2.00}
 
-Available sections:
-  - \ref @PLUGIN_ID@Overview
+\tableofcontents
 
-\section @PLUGIN_ID@Overview
+\section @PLUGIN_ID@Overview Overview
 This is the description for the @PLUGIN_NAME@.
 
 */