Merge remote-tracking branch 'upstream/dev' into dev

53 files changed, 183 insertions, 35 deletions

diff --git a/view/pdl/mod_admin.pdl b/view/pdl/mod_admin.pdl
index 1cf49750d..3c9633a69 100644
--- a/view/pdl/mod_admin.pdl
+++ b/view/pdl/mod_admin.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=admin][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_appman.pdl b/view/pdl/mod_appman.pdl
index 8bd407372..71306785e 100644
--- a/view/pdl/mod_appman.pdl
+++ b/view/pdl/mod_appman.pdl
@@ -1,5 +1,8 @@
 [region=aside]
-[widget=appcategories][/widget]
+[widget=appstore][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_apps.pdl b/view/pdl/mod_apps.pdl
index 32e2ce560..be9e15366 100644
--- a/view/pdl/mod_apps.pdl
+++ b/view/pdl/mod_apps.pdl
@@ -2,6 +2,9 @@
 [widget=appstore][/widget]
 [widget=appcategories][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_articles.pdl b/view/pdl/mod_articles.pdl
index 3e77ced4c..051e89278 100644
--- a/view/pdl/mod_articles.pdl
+++ b/view/pdl/mod_articles.pdl
@@ -1,9 +1,13 @@
 [region=aside]
+[widget=profile][/widget]
 [widget=archive][var=articles]1[/var][/widget]
 [widget=categories][var=articles]1[/var][/widget]
 [widget=tasklist][/widget]
 [widget=notes][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_blocks.pdl b/view/pdl/mod_blocks.pdl
index 4a90a4f36..c0ccacdc7 100644
--- a/view/pdl/mod_blocks.pdl
+++ b/view/pdl/mod_blocks.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=design_tools][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_cal.pdl b/view/pdl/mod_cal.pdl
index 7e15fc869..47af1ed38 100644
--- a/view/pdl/mod_cal.pdl
+++ b/view/pdl/mod_cal.pdl
@@ -1,5 +1,8 @@
 [region=aside]
-[widget=fullprofile][/widget]
+[widget=profile][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl
index f0403e380..2252659a3 100644
--- a/view/pdl/mod_cards.pdl
+++ b/view/pdl/mod_cards.pdl
@@ -1,8 +1,12 @@
 [region=aside]
+[widget=profile][/widget]
 [widget=categories][var=cards]1[/var][/widget]
 [widget=tasklist][/widget]
 [widget=notes][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_cdav.pdl b/view/pdl/mod_cdav.pdl
index c0f9a511f..be5b491ae 100644
--- a/view/pdl/mod_cdav.pdl
+++ b/view/pdl/mod_cdav.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=cdav][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl
index 5857fca95..80333afdc 100644
--- a/view/pdl/mod_channel.pdl
+++ b/view/pdl/mod_channel.pdl
@@ -8,6 +8,9 @@
 [widget=categories][/widget]
 [widget=tagcloud_wall][var=limit]24[/var][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_chanview.pdl b/view/pdl/mod_chanview.pdl
index a5461df50..0527ac00c 100644
--- a/view/pdl/mod_chanview.pdl
+++ b/view/pdl/mod_chanview.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=vcard][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl
index 808ba3d5a..b761e3361 100644
--- a/view/pdl/mod_chat.pdl
+++ b/view/pdl/mod_chat.pdl
@@ -1,10 +1,13 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
 [widget=chatroom_list][/widget]
 [widget=bookmarkedchats][/widget]
 [widget=suggestedchats][/widget]
 [widget=chatroom_members][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_cloud.pdl b/view/pdl/mod_cloud.pdl
index 44ef1e4fc..699aff1f8 100644
--- a/view/pdl/mod_cloud.pdl
+++ b/view/pdl/mod_cloud.pdl
@@ -1,7 +1,10 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
 [widget=categories][var=files]1[/var][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_common.pdl b/view/pdl/mod_common.pdl
index 7e15fc869..df722e5bf 100644
--- a/view/pdl/mod_common.pdl
+++ b/view/pdl/mod_common.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=fullprofile][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_connect.pdl b/view/pdl/mod_connect.pdl
index d7e5d29f3..47af1ed38 100644
--- a/view/pdl/mod_connect.pdl
+++ b/view/pdl/mod_connect.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=profile][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_connections.pdl b/view/pdl/mod_connections.pdl
index b777cada5..992ed9ca4 100644
--- a/view/pdl/mod_connections.pdl
+++ b/view/pdl/mod_connections.pdl
@@ -1,9 +1,9 @@
 [region=aside]
-[widget=follow][/widget]
-[widget=collections][var=mode][connections[/arg][/widget]
-[widget=suggestions][/widget]
 [widget=findpeople][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_connedit.pdl b/view/pdl/mod_connedit.pdl
index 4bdadb5e8..0527ac00c 100644
--- a/view/pdl/mod_connedit.pdl
+++ b/view/pdl/mod_connedit.pdl
@@ -1,8 +1,8 @@
 [region=aside]
 [widget=vcard][/widget]
-[widget=collections][var=mode]abook[/var][/widget]
-[widget=suggestions][/widget]
-[widget=findpeople][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_defperms.pdl b/view/pdl/mod_defperms.pdl
index 37c85c765..759dbf039 100644
--- a/view/pdl/mod_defperms.pdl
+++ b/view/pdl/mod_defperms.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=settings_menu][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_directory.pdl b/view/pdl/mod_directory.pdl
index 2e408c29f..56ce119f8 100644
--- a/view/pdl/mod_directory.pdl
+++ b/view/pdl/mod_directory.pdl
@@ -2,7 +2,9 @@
 [widget=findpeople][/widget]
 [widget=dirsort][/widget]
 [widget=dirtags][/widget]
-[widget=suggestions][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_display.pdl b/view/pdl/mod_display.pdl
index a5461df50..0527ac00c 100644
--- a/view/pdl/mod_display.pdl
+++ b/view/pdl/mod_display.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=vcard][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_editblock.pdl b/view/pdl/mod_editblock.pdl
index 4a90a4f36..c0ccacdc7 100644
--- a/view/pdl/mod_editblock.pdl
+++ b/view/pdl/mod_editblock.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=design_tools][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_editlayout.pdl b/view/pdl/mod_editlayout.pdl
index 4a90a4f36..c0ccacdc7 100644
--- a/view/pdl/mod_editlayout.pdl
+++ b/view/pdl/mod_editlayout.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=design_tools][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_editwebpage.pdl b/view/pdl/mod_editwebpage.pdl
index 4a90a4f36..c0ccacdc7 100644
--- a/view/pdl/mod_editwebpage.pdl
+++ b/view/pdl/mod_editwebpage.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=design_tools][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_go.pdl b/view/pdl/mod_go.pdl
index 7e15fc869..df722e5bf 100644
--- a/view/pdl/mod_go.pdl
+++ b/view/pdl/mod_go.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=fullprofile][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_group.pdl b/view/pdl/mod_group.pdl
index 34eb7ddd1..523f24178 100644
--- a/view/pdl/mod_group.pdl
+++ b/view/pdl/mod_group.pdl
@@ -1,5 +1,8 @@
 [region=aside]
-[widget=collections][var=mode]groups[/var][/widget]
+[widget=privacygroups][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_help.pdl b/view/pdl/mod_help.pdl
index 4bb380cc9..6f8a41226 100644
--- a/view/pdl/mod_help.pdl
+++ b/view/pdl/mod_help.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=helpindex][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_hq.pdl b/view/pdl/mod_hq.pdl
index 1bcdb2c65..9e139d7b9 100644
--- a/view/pdl/mod_hq.pdl
+++ b/view/pdl/mod_hq.pdl
@@ -1,5 +1,20 @@
 [region=aside]
-[widget=hq_controls][/widget]
+[widget=messages][/widget]
+[widget=hq_controls]
+	[var=wrapper_class]d-none d-lg-block[/var]
+	[var=entry_class]btn-outline-primary[/var]
+[/widget]
+[/region]
+[region=content]
+[widget=notes]
+	[var=hidden]1[/var]
+	[var=app]1[/var]
+[/widget]
+$content
+[widget=hq_controls]
+	[var=wrapper_class]hq_controls_fixed_bottom_center d-lg-none[/var]
+	[var=entry_class]btn-lg btn-primary shadow[/var]
+[/widget]
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_id.pdl b/view/pdl/mod_id.pdl
index 7e15fc869..df722e5bf 100644
--- a/view/pdl/mod_id.pdl
+++ b/view/pdl/mod_id.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=fullprofile][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_rate.pdl b/view/pdl/mod_import_items.pdl
index a5461df50..9f0bb4d9a 100644
--- a/view/pdl/mod_rate.pdl
+++ b/view/pdl/mod_import_items.pdl
@@ -1,7 +1,8 @@
 [region=aside]
-[widget=vcard][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
-[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_layouts.pdl b/view/pdl/mod_layouts.pdl
index 4a90a4f36..c0ccacdc7 100644
--- a/view/pdl/mod_layouts.pdl
+++ b/view/pdl/mod_layouts.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=design_tools][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_locs.pdl b/view/pdl/mod_locs.pdl
index 37c85c765..759dbf039 100644
--- a/view/pdl/mod_locs.pdl
+++ b/view/pdl/mod_locs.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=settings_menu][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_menu.pdl b/view/pdl/mod_menu.pdl
index 4a90a4f36..c0ccacdc7 100644
--- a/view/pdl/mod_menu.pdl
+++ b/view/pdl/mod_menu.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=design_tools][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_mitem.pdl b/view/pdl/mod_mitem.pdl
index 0cca7fd85..f0b03c854 100644
--- a/view/pdl/mod_mitem.pdl
+++ b/view/pdl/mod_mitem.pdl
@@ -2,6 +2,9 @@
 [widget=design_tools][/widget]
 [widget=menu_preview][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_moderate.pdl b/view/pdl/mod_moderate.pdl
index 95f069031..11cdb4672 100644
--- a/view/pdl/mod_moderate.pdl
+++ b/view/pdl/mod_moderate.pdl
@@ -1,3 +1,8 @@
+[region=aside]
+[/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl
index a4bdf0a9f..231f08e74 100644
--- a/view/pdl/mod_network.pdl
+++ b/view/pdl/mod_network.pdl
@@ -2,8 +2,6 @@
 [widget=activity_order][/widget]
 [widget=activity_filter][/widget]
 [widget=savedsearch][/widget]
-[widget=suggestions][/widget]
-[widget=notes][/widget]
 [/region]
 
 [region=content]
diff --git a/view/pdl/mod_message.pdl b/view/pdl/mod_permcats.pdl
index 3f1dd594f..996b073da 100644
--- a/view/pdl/mod_message.pdl
+++ b/view/pdl/mod_permcats.pdl
@@ -1,5 +1,8 @@
 [region=aside]
-[widget=mailmenu][/widget]
+[widget=permcats][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_photos.pdl b/view/pdl/mod_photos.pdl
index 6a3d30b1c..4b544faa9 100644
--- a/view/pdl/mod_photos.pdl
+++ b/view/pdl/mod_photos.pdl
@@ -1,7 +1,10 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
 [widget=photo_albums][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_profile.pdl b/view/pdl/mod_profile.pdl
index 7e15fc869..df722e5bf 100644
--- a/view/pdl/mod_profile.pdl
+++ b/view/pdl/mod_profile.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=fullprofile][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_profile_photo.pdl b/view/pdl/mod_profile_photo.pdl
index 7e15fc869..df722e5bf 100644
--- a/view/pdl/mod_profile_photo.pdl
+++ b/view/pdl/mod_profile_photo.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=fullprofile][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_profiles.pdl b/view/pdl/mod_profiles.pdl
index 7e15fc869..df722e5bf 100644
--- a/view/pdl/mod_profiles.pdl
+++ b/view/pdl/mod_profiles.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=fullprofile][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_profperm.pdl b/view/pdl/mod_profperm.pdl
index 7e15fc869..47af1ed38 100644
--- a/view/pdl/mod_profperm.pdl
+++ b/view/pdl/mod_profperm.pdl
@@ -1,5 +1,8 @@
 [region=aside]
-[widget=fullprofile][/widget]
+[widget=profile][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_pubstream.pdl b/view/pdl/mod_pubstream.pdl
index 539900155..914218e19 100644
--- a/view/pdl/mod_pubstream.pdl
+++ b/view/pdl/mod_pubstream.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_ratings.pdl b/view/pdl/mod_ratings.pdl
deleted file mode 100644
index f6e87cb7c..000000000
--- a/view/pdl/mod_ratings.pdl
+++ /dev/null
@@ -1,11 +0,0 @@
-[region=aside]
-[widget=pubsites][/widget]
-[widget=vcard][/widget]
-[widget=rating][/widget]
-[widget=suggestions][/widget]
-[widget=findpeople][/widget]
-[/region]
-[region=right_aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl
index ed1f77c5a..11cdb4672 100644
--- a/view/pdl/mod_search.pdl
+++ b/view/pdl/mod_search.pdl
@@ -1,5 +1,8 @@
 [region=aside]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_settings.pdl b/view/pdl/mod_settings.pdl
index 37c85c765..759dbf039 100644
--- a/view/pdl/mod_settings.pdl
+++ b/view/pdl/mod_settings.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=settings_menu][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_sharedwithme.pdl b/view/pdl/mod_sharedwithme.pdl
index 95f069031..11cdb4672 100644
--- a/view/pdl/mod_sharedwithme.pdl
+++ b/view/pdl/mod_sharedwithme.pdl
@@ -1,3 +1,8 @@
+[region=aside]
+[/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_sources.pdl b/view/pdl/mod_sources.pdl
index 37c85c765..759dbf039 100644
--- a/view/pdl/mod_sources.pdl
+++ b/view/pdl/mod_sources.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=settings_menu][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_suggest.pdl b/view/pdl/mod_suggest.pdl
index b74391cba..7878bca4e 100644
--- a/view/pdl/mod_suggest.pdl
+++ b/view/pdl/mod_suggest.pdl
@@ -2,6 +2,9 @@
 [widget=follow][/widget]
 [widget=findpeople][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_thing.pdl b/view/pdl/mod_thing.pdl
index 7e15fc869..df722e5bf 100644
--- a/view/pdl/mod_thing.pdl
+++ b/view/pdl/mod_thing.pdl
@@ -1,6 +1,9 @@
 [region=aside]
 [widget=fullprofile][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_mail.pdl b/view/pdl/mod_tokens.pdl
index d572b7244..6a81829fe 100644
--- a/view/pdl/mod_mail.pdl
+++ b/view/pdl/mod_tokens.pdl
@@ -1,6 +1,8 @@
 [region=aside]
-[widget=mailmenu][/widget]
-[widget=conversations][/widget]
+[widget=tokens][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_uexport.pdl b/view/pdl/mod_uexport.pdl
index ed1f77c5a..11cdb4672 100644
--- a/view/pdl/mod_uexport.pdl
+++ b/view/pdl/mod_uexport.pdl
@@ -1,5 +1,8 @@
 [region=aside]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_viewconnections.pdl b/view/pdl/mod_viewconnections.pdl
index 7e15fc869..47af1ed38 100644
--- a/view/pdl/mod_viewconnections.pdl
+++ b/view/pdl/mod_viewconnections.pdl
@@ -1,5 +1,8 @@
 [region=aside]
-[widget=fullprofile][/widget]
+[widget=profile][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl
index d13bf8862..87945fb5f 100644
--- a/view/pdl/mod_webpages.pdl
+++ b/view/pdl/mod_webpages.pdl
@@ -2,6 +2,9 @@
 [widget=design_tools][/widget]
 [widget=website_portation_tools][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl
index be86be7e3..e650e364e 100644
--- a/view/pdl/mod_wiki.pdl
+++ b/view/pdl/mod_wiki.pdl
@@ -1,7 +1,10 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
 [widget=wiki_pages][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]