diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 72a862c722e..fc20663ed80 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -6,7 +6,7 @@
     <ul class="nav navbar-nav nav-tabs">
       <li class="active"><a href="#snippet_structure" data-toggle="tab">Structure</a></li>
       <li><a href="#snippet_content" data-toggle="tab">Content</a></li>
-      <li><a href="#snippet_business" data-toggle="tab">Business</a></li>
+      <li><a href="#snippet_feature" data-toggle="tab">Features</a></li>
       <li><a href="#snippet_effect" data-toggle="tab">Effects</a></li>
     </ul>
     <div class="tab-content">
@@ -67,8 +67,8 @@
                 <div class="item image_text active" style="background-image: url('/website/static/src/img/banner/color_splash.jpg')">
                     <div class="container" contenteditable="true">
                         <div class="carousel-caption content">
-                            <h2>Set Your Banner Title</h2>
-                            <h3>Customize with the top-left menu</h3>
+                            <h2>Your Banner Title</h2>
+                            <h3>Click to customize this text</h3>
                             <p>
                                 <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
                             </p>
@@ -94,7 +94,7 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-6 mt32">
-                        <h3>Enterprise Social Network</h3>
+                        <h3>A Section Subtitle</h3>
                         <p>
                             Make every employee feel more connected and engaged
                             with twitter-like features for your own company. Follow
@@ -128,7 +128,7 @@
                         <img class="img-responsive shadow" src="/website/static/src/img/image_text.jpg"/>
                     </div>
                     <div class="col-md-6 mt32">
-                        <h3>Manage Your Shops</h3>
+                        <h3>A Section Subtitle</h3>
                         <p>
                             OpenERP's Point of Sale introduces a super clean
                             interface with no installation required that runs
@@ -177,9 +177,9 @@
                 <div class="row">
                     <div class="col-md-12 text-center mt16 mb32">
                         <h2>
-                            OpenERP Project Management
+                            A Great Title
                         </h2>
-                        <h3 class="text-muted">Infinitely flexible. Incredibly easy to use.</h3>
+                        <h3 class="text-muted">A good subtitle. Very good.</h3>
                     </div>
                     <div class="col-md-12 mb16 mt16">
                         <p>
@@ -212,7 +212,7 @@
                 <div class="row">
                     <div class="col-md-12">
                         <h1 class="text-center">Your Website Title</h1>
-                        <h3 class="text-muted text-center">Great products for great people</h3>
+                        <h3 class="text-muted text-center">Ans a great subtitle too</h3>
                     </div>
                 </div>
             </div>
@@ -238,14 +238,14 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt32 mb32">
-                        <h2>Work with the hardware you already have...</h2>
+                        <h2>A Great Section Title</h2>
                     </div>
                     <div class="col-md-12">
                         <img class="img-responsive" src="/website/static/src/img/big_picture.png" style="margin: 0 auto;"/>
                     </div>
                     <div class="col-md-6 col-md-offset-3 mb16 mt16">
                         <p class="text-center">
-                            <b>No installation required</b>
+                            <b>A Small Subtitle</b>
                         </p>
                         <p class="text-center">
                             OpenERP's Point of Sale introduces a super clean
@@ -254,7 +254,7 @@
                             tablets, industrial POS, it runs on everything.
                         </p>
                         <p class="text-center">
-                            <a href="/page/website.contactus">Get more information »</a>
+                            <a href="/page/website.contactus">Contact us »</a>
                         </p>
                     </div>
                 </div>
@@ -272,8 +272,8 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt16 mb16">
-                        <h2>OpenERP HR Features</h2>
-                        <h3 class="text-muted">Manage your company most important asset: People</h3>
+                        <h2>A Great Title</h2>
+                        <h3 class="text-muted">And a good subtitle</h3>
                     </div>
                     <div class="col-md-4">
                         <img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
@@ -354,7 +354,7 @@
         </div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
-                <h3 class="panel-title">OpenERP Features</h3>
+                <h3 class="panel-title">Your Title</h3>
             </div>
             <div class="panel-body">
                 OpenERP's collaborative and realtime project management helps
@@ -376,7 +376,7 @@
 
 </div>
 
-<div id="snippet_business" class="tab-pane fade">
+<div id="snippet_feature" class="tab-pane fade">
 
     <div data-snippet-id="portfolio" data-selector-children=".oe_structure, [data-oe-type=html]">
         <div class="oe_snippet_thumbnail">
@@ -713,10 +713,10 @@
                 <div class="row">
                     <div class="col-md-12 mt128 mb32">
                         <h1 class="text-center">
-                            <b>OpenERP Events Management</b>
+                            <b>A Great Title</b>
                         </h1>
                         <h3 class="text-center">
-                            Sell tickets online with the Event app
+                            And a motivating subtitle
                         </h3>
                     </div>
                 </div>
diff --git a/addons/website_google_map/__openerp__.py b/addons/website_google_map/__openerp__.py
index f1fed29227e..d7d188219af 100644
--- a/addons/website_google_map/__openerp__.py
+++ b/addons/website_google_map/__openerp__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Website Google Map',
-    'category': 'Website',
+    'category': 'Hidden',
     'summary': '',
     'version': '1.0',
     'description': """
@@ -14,4 +14,5 @@ OpenERP Website Google Map
         'views/google_map.xml',
     ],
     'installable': True,
+    'auto_install': True,
 }
diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py
index a4d3c146274..9c327ed518d 100644
--- a/addons/website_mail/__openerp__.py
+++ b/addons/website_mail/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     'name': 'Website Mail',
-    'category': 'Website',
+    'category': 'Hidden',
     'summary': 'Website Module for Mail',
     'version': '0.1',
     'description': """Glue module holding mail improvements for website.""",
diff --git a/addons/website_membership/__openerp__.py b/addons/website_membership/__openerp__.py
index 2d470cd6aa1..68147171ba2 100644
--- a/addons/website_membership/__openerp__.py
+++ b/addons/website_membership/__openerp__.py
@@ -1,5 +1,5 @@
 {
-    'name': 'Public Partners Members',
+    'name': 'Public Members',
     'category': 'Website',
     'summary': 'Publish Members',
     'version': '1.0',