diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 4675cea75f9..79194659b34 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -21,7 +21,7 @@
             <field name="model">wiki.groups</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Wikis">
+                <tree string="Wiki Groups">
                     <field name="name"/>
                 </tree>
             </field>
@@ -34,7 +34,7 @@
             <field name="model">wiki.groups</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wikis">
+                <form string="Wiki Groups">
                     <group colspan="4" col="4">
                         <field name="name" select="1"/>
                         <field name="create_date" readonly="2"/>
@@ -62,7 +62,7 @@
 <!--  Wiki Groups Action  -->
 
         <record model="ir.actions.act_window" id="action_wiki_groups">
-            <field name="name">Wikis</field>
+            <field name="name">Wiki Groups</field>
             <field name="res_model">wiki.groups</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -74,7 +74,7 @@
             action="action_wiki_groups"/>
 
         <record model="ir.actions.act_window" id="action_wiki_groups_browse">
-            <field name="name">Wikis</field>
+            <field name="name">Wiki Groups</field>
             <field name="res_model">wiki.groups</field>
             <field name="view_type">tree</field>
         </record>
@@ -126,13 +126,15 @@
                 <form string="Wiki">
                     <group col="8" colspan="4">
                         <field name="name" select="1" colspan="6"/>
-                        <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="section" invisible="not context.get('section',False)"/>
-                        <field name="parent_id"/>
                         <button name="open_wiki_page" type="object"
                         string="Basic Wiki Editing" icon="gtk-ok" />
                     </group>
-
+                    <group col="8" colspan="4">
+                        <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
+                        <field name="section" invisible="not context.get('section',False)"/>
+                        <field name="parent_id"/>
+                    </group>
+					<separator colspan="4" string="Informations"/>
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                     <separator colspan="4" string="Modifications"/>
                     <group col="6" colspan="4">
@@ -169,7 +171,7 @@
 <!-- search page for wiki -->
 
         <record model="ir.actions.act_window" id="action_wiki">
-            <field name="name">Search Pages</field>
+            <field name="name">Wiki Pages</field>
             <field name="res_model">wiki.wiki</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index f9b0acbf273..b4ae419deab 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -9,13 +9,11 @@
             <field name="model">wiki.make.index</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create Menu">
-    			<separator string="Menu Information" colspan="4"/>
-    			<label string="Want to create a Index on Selected Pages ? "/>
+              <form string="Create Index">
+    			<label string="Want to create a Index on Selected Pages ?" colspan="4"/>
     			<separator string="" colspan="6" />
-    	        <label string="" colspan="2"/>
-    	        <group>
-        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
+    	        <group col="4" colspan="4">
+        	    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
             	<button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
             	</group>
 			</form>
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index ec8fcb3ca6d..393e29b8b8b 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -14,6 +14,7 @@
     			 <field name="diff" nolabel="1" colspan="4" width="300"/>
     	        <label string="" colspan="2" />
     	        <group>
+    	        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
         	    <button special="cancel" string="OK" icon="gtk-ok" />
             	</group>
 			</form>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 507f3d5cdac..98ed33a940d 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -10,11 +10,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Open Page">
-             	<separator string="" colspan="6" />
-              	<label string="Want to open a wiki page? "/>
-              	<separator string="" colspan="6" />
-    	        <label string="" colspan="2" />
-    	        <group>
+              	<label string="Want to open a wiki page?" colspan="4"/>
+              	<separator string="" colspan="4"/>
+    	        <group col="4" colspan="4">
         	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
                	<button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
                	</group>