diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index cf792be226f..b15346dba39 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -33,10 +33,14 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'wizard/wizard_view.xml',
+        'wizard/wiki_wiki_page_open_view.xml',
+        'wizard/wiki_create_menu_view.xml',
+        'wizard/wiki_wiki_help_open_view.xml',
+        'wizard/wiki_make_index_view.xml',
         'wiki_view.xml',
         'data/wiki_quickstart.xml',
         'data/wiki_main.xml',
-        'wizard/wizard_view.xml',
         'security/ir.model.access.csv'
     ],
     'demo_xml': [],
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index d2fa06d4fd5..e6feae5eeba 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -6,7 +6,7 @@
         <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
         <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>
 
-        <wizard
+         <wizard
             id="wizard_group_menu_create"
             string="Create Menu"
             menu="True"
@@ -49,11 +49,16 @@
                         <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
                     </page>
                     </notebook>
-                    <button
-                        name="%(wizard_group_menu_create)d"
-                        string="Create a Menu"
-                        type="action"
-                        target="new" icon="gtk-justify-fill"/>
+                     <button
+			 	    	name="%(wiki.action_wiki_create_menu)d"
+			 	    	string="Create Menu"
+			 	     	type="action"
+			 	     	icon="gtk-justify-fill" />
+			 	     <button
+			 	    	name="%(wiki.action_view_wiki_wiki_page_open)d"
+			 	    	string="Open Wiki Page"
+			 	     	type="action"/>
+
                 </form>
             </field>
         </record>
@@ -137,6 +142,14 @@
                         <field name="tags" select="1" groups="base.group_extended"/>
                         <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
                     </group>
+                     <button
+			 	    	name="%(wiki.action_view_wiki_wiki_help_open)d"
+			 	    	string="Basic Wiki Editing"
+			 	     	type="action"/>
+			 	     <button
+			 	    	name="%(wiki.action_view_wiki_make_index)d"
+			 	    	string="Create Index"
+			 	     	type="action"/>
                 </form>
             </field>
         </record>
@@ -234,7 +247,7 @@
             res_model="wiki.wiki"
             src_model="wiki.groups"/>
 
-        <wizard
+         <wizard
             id="wizard_open_page"
             string="Open Wiki Pages"
             name="wiki.wiki.page.open"
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 1777b053bca..0c25e5f353c 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,18 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import open_page
-import open_help
 import create_menu
-import show_diff
 import make_index
+import open_help
+import open_page
+import show_diff
+
+import wiki_wiki_page_open
+import wiki_create_menu
+import wiki_wiki_help_open
+import wiki_make_index
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index e31a9daa664..633f45eb91d 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -53,7 +53,7 @@ def wiki_menu_create(self, cr, uid, data, context):
     home = data['form']['page']
     group_id = data['id']
     res = {
-        'home':home,
+        'home': home,
     }
     pool.get('wiki.groups').write(cr, uid, [data['id']], res)
     pool.get('wiki.groups.link').create(cr, uid, {'group_id':group_id, 'action_id':menu_id})
diff --git a/addons/wiki/wizard/wizard_view.xml b/addons/wiki/wizard/wizard_view.xml
index cbc5f020731..ce639714daf 100644
--- a/addons/wiki/wizard/wizard_view.xml
+++ b/addons/wiki/wizard/wizard_view.xml
@@ -13,18 +13,18 @@
             </field>
         </record>
         <act_window
-            id="act_view_diff" 
-            name="Differences" 
-            res_model="wizard.wiki.history.show_diff" 
+            id="act_view_diff"
+            name="Differences"
+            res_model="wizard.wiki.history.show_diff"
             src_model="wiki.wiki.history"
             target="new"
             view_mode="form"
         />
-<!--        <wizard
+        <wizard
             id="wizard_make_index"
             string="Create Index"
             name="wiki.make.index"
-            model="wiki.wiki"/-->
+            model="wiki.wiki"/>
         <wizard
             id="wizard_open_help"
             string="Basic Wiki Editing"