diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index a32045efafc..ba2797a6051 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,13 +3,14 @@
     <data>
 
         <!-- toplevel menu -->
+        <!-- TODO Rename to name of the default company -->
         <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
             web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png" 
-            groups="base.group_user"/>
+            web_icon_hover="static/src/img/feeds-hover.png"/>
 
         <!-- left-side menu: Feeds !-->
-        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
+        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
+
         <record id="mail_wallfeeds" model="ir.ui.menu">
           <field name="name">News Feed</field>
           <field name="sequence" eval="10"/>
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 2cba3a1945a..3f7e6804d9b 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,11 +2,30 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="company_news_feed" model="mail.group">
+            <field name="name">Company's news feed</field>
+        </record>
+
+        <record id="action_news" model="ir.actions.act_window">
+            <field name="name">News</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="view_mode">form</field>
+        </record>
+
+        <!-- default portal menu structure -->
+        <menuitem name="Our company" id="portal_company" parent="mail.mail_feeds_main" sequence="20"/>
+            <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+
+        <menuitem name="Orders" id="portal_orders" parent="mail.mail_feeds_main" sequence="30"/>
+        <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="mail.mail_feeds_main" sequence="40"/>
+        <menuitem name="Projects" id="portal_projects" parent="mail.mail_feeds_main" sequence="50"/>
+        <menuitem name="After Sale Services" id="portal_after_sales" parent="mail.mail_feeds_main" sequence="60"/>
+
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
             <field name="group_id" ref="group_portal_member"/>
-            <field name="override_menu" eval="True"/>
-            <field name="parent_menu_id" ref="portal_members_root_menu"/>
+            <field name="override_menu" eval="False"/>
         </record>
 
     </data>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index e56dfda67f2..818753dede6 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -2,20 +2,6 @@
 <openerp>
     <data>
 
-        <!-- menu Administration/Portals/Portals -->
-        <record id="portal_list_action" model="ir.actions.act_window">
-            <field name="name">Portals</field>
-            <field name="res_model">res.portal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <!-- a context is necessary to get the right portal form view -->
-            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
-            <field name="help">
-A portal helps defining specific views and rules for a group of users (the
-portal group).  A portal menu, widgets and specific groups may be assigned to
-the portal's users.
-            </field>
-        </record>
 
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
@@ -28,7 +14,6 @@ the portal's users.
                 </tree>
             </field>
         </record>
-
         <!-- portal form view -->
         <record id="portal_form_view" model="ir.ui.view">
             <field name="name">Portal Form</field>
@@ -65,43 +50,23 @@ the portal's users.
                 </page>
             </field>
         </record>
-
-        <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news feed</field>
+        <!-- action Administration/Portals/Portals -->
+        <record id="portal_list_action" model="ir.actions.act_window">
+            <field name="name">Portals</field>
+            <field name="res_model">res.portal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <!-- a context is necessary to get the right portal form view -->
+            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
+            <field name="help">
+A portal helps defining specific views and rules for a group of users (the
+portal group).  A portal menu, widgets and specific groups may be assigned to
+the portal's users.
+            </field>
         </record>
-
-        <record id="action_news" model="ir.actions.act_window">
-            <field name="name">News</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="company_news_feed"/>
-            <field name="view_mode">form</field>
-        </record>
-
-
-        <!-- module's menu -->
-        <!-- menu Administration/Portals -->
-        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration"
-            groups="group_portal_manager"/>
-
+        <!-- menu Administration/Portals/Portals -->
+        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration" groups="group_portal_manager"/>
             <menuitem name="Portals" id="portal_list_menu" parent="portal_menu_settings" action="portal_list_action"/>
 
-            <!-- root menu for portal members (chrooted in this menu) -->
-            <menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
-
-                <menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
-                    <menuitem name="Our company" id="portal_company"
-                        parent="menu_portal" sequence="10"/>
-                        <menuitem name="News" id="portal_company_news"
-                            parent="portal_company" sequence="10" action="action_news"/>
-
-                    <menuitem name="Orders" id="portal_orders"
-                        parent="menu_portal" sequence="20"/>
-                    <menuitem name="Invoices and Payments" id="portal_invoices_payements"
-                        parent="menu_portal" sequence="30"/>
-                    <menuitem name="Projects" id="portal_projects"
-                        parent="menu_portal" sequence="40"/>
-                    <menuitem name="After Sale Services" id="portal_after_sales"
-                        parent="menu_portal" sequence="50"/>
-
     </data>
 </openerp>
diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index 6cad34bc963..e2bd342aada 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -4,58 +4,9 @@
 
  /* Root container */
 .openerp .oe_portal_crm_contact {
-    width: 100%;
-}
-
-/* Sections containers */
-.oe_portal_crm_callout,
-.oe_portal_crm_contact_form,
-.oe_portal_crm_office,
-.oe_portal_crm_team {
-    padding: 0 5px;
-}
-
-/* Sections titles */
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout h1,
-.openerp .oe_portal_crm_contact .oe_portal_crm_contact_form h1,
-.openerp .oe_portal_crm_contact .oe_portal_crm_office h1 {
-    display: inline-block;
-    border-color: #4C4C4C;
-    border-style: solid;
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout h1 {
-    border-width: 0 0 5px 0;
-    margin-bottom: 0;
-    padding-bottom: 0;
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_contact_form h1,
-.openerp .oe_portal_crm_contact .oe_portal_crm_office h1 {
-    border-width: 5px 0 0 0;
-    margin-top: 0;
-    padding-top: 0;
-}
-
-
-
-/*
- * Sections layout
- */
-
-/* Callout section */
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout
- {
-    padding: 0 5px;
-    /* background is defined directly in the view itself */
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout .oe_portal_crm_background_wrapper {
-    height: 120px;
-    border-bottom: 1px solid #4C4C4C;
-    border-top: 1px solid #4C4C4C;
-    padding: 5px 0;
-}
-.openerp .oe_portal_crm_contact .oe_portal_crm_callout .oe_portal_crm_background {
-    width: 100%;
-    height: 100%;
+    width: 800px;
+    margin: auto;
+    padding: 8px 0 0 0;
 }
 
 /* Contact form section */
@@ -68,13 +19,11 @@
     float: none;
     display: block;
     width: 100%;
-    border: 1px solid #D8D8D8;
-    border-bottom-color: #B9B9B9;
     margin-bottom: 5px;
     padding: 5px;
 }
 
 /* Employees list section */
-.openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_fold_column.oe_kanban_record {
-
-}
\ No newline at end of file
+.openerp .oe_portal_crm_contact .oe_portal_crm_team {
+    padding: 8px 0 0 0;
+}
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 2a8378c6bc8..7c21b71a58b 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -58,5 +58,6 @@ class crm_contact_us(osv.TransientModel):
                 'view_type': 'form',
                 'res_model': self._name,
                 'res_id': ids[0],
-                'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1]
+                'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1],
+                'target': 'inline'
                }
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 0a64e7a79f2..d8322685ee0 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -9,30 +9,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contact wizard view" version="7.0">
-                  <sheet>
                     <div class="oe_portal_crm_contact">
-                        <div class="oe_portal_crm_callout">
-                            <h1>Contact OpenERP</h1>
-                            <div class="oe_portal_crm_background_wrapper">
-                                <div class="oe_portal_crm_background" style="background:url(https://lh5.googleusercontent.com/-FFcbJe8Ee1U/T6Aep2ug7hI/AAAAAAAAAD8/0lDMTMwUZTU/s1136/IMG_1170.JPG) center center"/>
-                            </div>
-                        </div>
                         <table>
                           <tr>
                             <td width="70%%">
                                 <div class="oe_portal_crm_contact_form">
-                                    <h1>Get in touch</h1>
-                                    <field name="contact_name" placeholder="Name"/>
-                                    <field name="partner_name" placeholder="Company"/>
-                                    <field name="email_from" placeholder="Email"/>
-                                    <field name="phone" placeholder="Phone"/>
+                                    <h1>Contact us</h1>
+                                    <group>
+                                        <field name="contact_name" placeholder="Name"/>
+                                        <field name="partner_name" placeholder="Company"/>
+                                        <field name="email_from" placeholder="Email"/>
+                                        <field name="phone" placeholder="Phone"/>
+                                    </group>
                                     <field name="description" placeholder="Your question"/>
                                     <button string="Submit" name="submit" type="object"/>
                                 </div>
                             </td>
                             <td>
                                 <div class="oe_portal_crm_office">
-                                    <h1>Our office</h1>
                                     <field name="company_ids" widget="many2many_kanban">
                                         <kanban>
                                             <field name="name"/>
@@ -102,7 +96,6 @@
                           </tr>
                         </table>
                     </div>
-                  </sheet>
                 </form>
             </field>
         </record>
@@ -139,5 +132,8 @@
         <menuitem name="Contact" id="portal_company_contact"
             parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
 
+        <!-- test menu item to compare with and without menu -->
+        <menuitem name="FullContact" id="portal_company_contact2" action="action_wizard_contact_us" sequence="120" groups="base.group_no_one"/>
+
     </data>
 </openerp>