diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index cbf5279f176..b0c6daec3bd 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -25,6 +25,7 @@
         'wizard/mass_mailing_list_merge_views.xml',
         'wizard/test_mailing_views.xml',
         'wizard/mass_mailing_schedule_date_views.xml',
+        'views/mass_mailing_views_menus.xml',
         'views/mass_mailing_report_views.xml',
         'views/mass_mailing_stats_views.xml',
         'views/link_tracker_views.xml',
diff --git a/addons/mass_mailing/views/link_tracker_views.xml b/addons/mass_mailing/views/link_tracker_views.xml
index f2cb5985d35..695768e0f8d 100644
--- a/addons/mass_mailing/views/link_tracker_views.xml
+++ b/addons/mass_mailing/views/link_tracker_views.xml
@@ -13,17 +13,51 @@
         </field>
     </record>
 
-    <record model="ir.actions.act_window" id="action_view_mass_mailing_links_statistics">
+    <record id="link_tracker_view_form" model="ir.ui.view">
+        <field name="name">link.tracker.view.form.inherit.mass.mail</field>
+        <field name="model">link.tracker</field>
+        <field name="inherit_id" ref="link_tracker.link_tracker_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='campaign_id']" position="before">
+                <field name="mass_mailing_id"/>
+                <field name="mass_mailing_campaign_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="link_tracker_action_mass_mailing" model="ir.actions.act_window">
         <field name="name">Statistics of Clicks</field>
         <field name="res_model">link.tracker</field>
-        <field name="view_mode">tree</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,graph</field>
+        <field name="view_id" ref="link_tracker.link_tracker_view_tree"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new link tracker
+            </p>
+        </field>
         <field name="context">{'search_default_mass_mailing_id': active_id}</field>
     </record>
-       
-    <record model="ir.actions.act_window" id="dropdb snipp">
+
+    <record id="link_tracker_action_mass_mailing_campaign" model="ir.actions.act_window">
         <field name="name">Statistics of Clicks</field>
         <field name="res_model">link.tracker</field>
-        <field name="view_mode">tree</field>
-        <field name="context">{'search_default_mass_mailing_campaign_id': active_id}</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,graph</field>
+        <field name="view_id" ref="link_tracker.link_tracker_view_tree"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new link tracker
+            </p>
+        </field>
+        <field name="context">{'id="link_tracker_action_mass_mailing"': active_id}</field>
     </record>
+
+    <!-- MENU TO HANLDE LINK DATA IN MM -->
+    <menuitem id="link_tracker_menu_mass_mailing"
+        name="Link Tracker"
+        parent="mass_mailing_configuration"
+        sequence="5"
+        action="link_tracker.link_tracker_action"/>
+
 </odoo>
diff --git a/addons/mass_mailing/views/mass_mailing_blacklist_views.xml b/addons/mass_mailing/views/mass_mailing_blacklist_views.xml
index 9940d09ba8c..85118d3f66d 100644
--- a/addons/mass_mailing/views/mass_mailing_blacklist_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_blacklist_views.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <menuitem id="mail_blacklist_mm_menu" name="Blacklist" action="mail.mail_blacklist_action" parent="menu_mass_mailing_configuration"/>
+    <menuitem id="mail_blacklist_mm_menu" name="Blacklist" action="mail.mail_blacklist_action" parent="mass_mailing_configuration"/>
 </odoo>
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 84bf335ca59..a2a6ff17780 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-        <!-- Marketing / Mailing -->
-        <menuitem name="Email Marketing" id="mass_mailing_menu_root" sequence="60" web_icon="mass_mailing,static/description/icon.png"/>
-        <menuitem name="Mailing Lists" id="mass_mailing_mailing_list_menu"
-            parent="mass_mailing_menu_root" sequence="2" groups="mass_mailing.group_mass_mailing_user"/>
-        <!-- Marketing / Configuration -->
-        <menuitem name="Configuration" id="mass_mailing_configuration"
-            parent="mass_mailing_menu_root" sequence="100"/>
-
         <!--  MAILING CONTACT -->
         <record model="ir.ui.view" id="mail_mass_mailing_list_contact_rel_view_form">
             <field name="name">mail.mass_mailing.list_contact_rel.view.form</field>
@@ -712,7 +703,7 @@
                                             </div>
                                             <div class="row">
                                                 <div class="col-8">
-                                                    <a name="%(action_view_mass_mailing_links_statistics)d"
+                                                    <a name="%(link_tracker_action_mass_mailing)d"
                                                        type="action">Clicks</a>
                                                 </div>
                                                 <div class="col-4 text-right">
@@ -866,11 +857,8 @@
             </field>
         </record>
 
-        <menuitem id="menu_mass_mailing_configuration" name="Configuration" parent="mass_mailing_menu_root"
-            sequence="100" groups="mass_mailing.group_mass_mailing_user"/>
-
         <menuitem name="Campaign Stages" id="menu_view_mass_mailing_stages"
-            parent="menu_mass_mailing_configuration" sequence="1"
+            parent="mass_mailing_configuration" sequence="1"
             groups="mass_mailing.group_mass_mailing_campaign"
             action="action_view_mass_mailing_stages"/>
 
@@ -897,7 +885,7 @@
             </field>
         </record>
 
-        <menuitem id="mass_mailing_tag_menu" parent="menu_mass_mailing_configuration" action="mass_mailing_tag_action" sequence="2" groups="base.group_no_one"/>
+        <menuitem id="mass_mailing_tag_menu" parent="mass_mailing_configuration" action="mass_mailing_tag_action" sequence="2" groups="base.group_no_one"/>
 
 
         <!--  MAILING CAMPAIGNS !-->
@@ -968,7 +956,7 @@
                                 type="action" class="oe_stat_button">
                                 <field name="replied_ratio" widget="percentpie" string="Replied"/>
                             </button>
-                            <button name="%(dropdb snipp)d"
+                            <button name="%(link_tracker_action_mass_mailing_campaign)d"
                                 type="action" class="oe_stat_button">
                                 <field name="clicks_ratio" widget="percentpie" string="Clicks"/>
                             </button>
diff --git a/addons/mass_mailing/views/mass_mailing_views_menus.xml b/addons/mass_mailing/views/mass_mailing_views_menus.xml
new file mode 100644
index 00000000000..57832e6850a
--- /dev/null
+++ b/addons/mass_mailing/views/mass_mailing_views_menus.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Marketing / Mailing -->
+    <menuitem name="Email Marketing" id="mass_mailing_menu_root" sequence="60" web_icon="mass_mailing,static/description/icon.png"/>
+    <menuitem name="Mailing Lists" id="mass_mailing_mailing_list_menu"
+        parent="mass_mailing_menu_root" sequence="2" groups="mass_mailing.group_mass_mailing_user"/>
+    <!-- Marketing / Configuration -->
+    <menuitem name="Configuration" id="mass_mailing_configuration"
+        parent="mass_mailing_menu_root"
+        sequence="100"
+        groups="mass_mailing.group_mass_mailing_user"/>
+</odoo>
\ No newline at end of file
diff --git a/addons/mass_mailing/views/res_config_settings_views.xml b/addons/mass_mailing/views/res_config_settings_views.xml
index 38600acbec9..a8a56b27461 100644
--- a/addons/mass_mailing/views/res_config_settings_views.xml
+++ b/addons/mass_mailing/views/res_config_settings_views.xml
@@ -74,8 +74,6 @@
             <field name="context">{'module' : 'mass_mailing'}</field>
         </record>
 
-        <menuitem id="menu_mass_mailing_configuration" name="Configuration" parent="mass_mailing_menu_root"
-            sequence="100"/>
         <menuitem id="menu_mass_mailing_global_settings" name="Settings"
-            parent="menu_mass_mailing_configuration" sequence="0" action="action_mass_mailing_configuration" groups="base.group_system"/>
+            parent="mass_mailing_configuration" sequence="0" action="action_mass_mailing_configuration" groups="base.group_system"/>
 </odoo>
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 91eb4b3f817..aa4e8be7704 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -28,6 +28,8 @@
                     <separator/>
                     <filter string="Starred" name="starred" domain="[('priority','in',[1, 2])]"/>
                     <separator/>
+                    <filter string="Opened" name="opened" domain="[('stage_id.fold','=',False)]"/>
+                    <separator/>
                     <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
                     <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
                     <separator/>