diff --git a/documentation/current/_templates/Beta.tpl b/documentation/current/_templates/Beta.tpl
index 74fc373e..803cade2 100644
--- a/documentation/current/_templates/Beta.tpl
+++ b/documentation/current/_templates/Beta.tpl
@@ -1 +1 @@
-<center><p style="text-align:center; width: 500px; border: 1px solid #FFB55F; padding: 10px; background-color: #FFEEBF; color: black;">[[Image:LogoBeta|24px]] '''Beta documentation:''' <span class="doc-tpl-inner">Caution! This page is currently under development as a new page or a replacement for a previously existing page. It may contain information which describes capabilities not yet implemented. Avoid linking to this page. When this page comes out of beta, it is likely that the name and/or UUID of this page will change. You can help the documentation effort by becoming a [[Community|contributor]].</span></p></center>
+<center class="doc-tpl-box"><p style="text-align:center; width: 500px; border: 1px solid #FFB55F; padding: 10px; background-color: #FFEEBF; color: black;">[[Image:LogoBeta|24px]] '''Beta documentation:''' Caution! This page is currently under development as a new page or a replacement for a previously existing page. It may contain information which describes capabilities not yet implemented. Avoid linking to this page. When this page comes out of beta, it is likely that the name and/or UUID of this page will change. You can help the documentation effort by becoming a [[Community|contributor]].</p></center>
diff --git a/documentation/current/_templates/ReviewRequested.tpl b/documentation/current/_templates/ReviewRequested.tpl
index 03abd243..823a2407 100644
--- a/documentation/current/_templates/ReviewRequested.tpl
+++ b/documentation/current/_templates/ReviewRequested.tpl
@@ -1 +1 @@
-<center><p style="text-align:center; width: 500px; border: 1px solid #0000CC; padding: 10px; background-color: #FFFFFF; color: black;">[[Image:LogoReviewRequested|24px]] '''Review requested: '''The material on this page needs to be reviewed for completeness and accuracy. If you have knowledge of this material, please review this page. If you are a [[Community|contributor]], feel free to make any appropriate additions and/or corrections, then remove this template. If not, you can note improvements on the [[Community#Using the Comments pages|comments]] page.</p></center>
+<center class="doc-tpl-box"><p style="text-align:center; width: 500px; border: 1px solid #0000CC; padding: 10px; background-color: #FFFFFF; color: black;">[[Image:LogoReviewRequested|24px]] '''Review requested: '''The material on this page needs to be reviewed for completeness and accuracy. If you have knowledge of this material, please review this page. If you are a [[Community|contributor]], feel free to make any appropriate additions and/or corrections, then remove this template. If not, you can note improvements on the [[Community#Using the Comments pages|comments]] page.</p></center>
diff --git a/documentation/current/_templates/ReviewRequested.tpl.data b/documentation/current/_templates/ReviewRequested.tpl.data
index bcba0b72..1da7684e 100644
--- a/documentation/current/_templates/ReviewRequested.tpl.data
+++ b/documentation/current/_templates/ReviewRequested.tpl.data
@@ -1,3 +1,3 @@
 title=ReviewRequested
-author=halw
+author=admin
 path=content/reviewrequested
diff --git a/documentation/current/_templates/UnderConstruction.tpl b/documentation/current/_templates/UnderConstruction.tpl
index f5ea7705..182544b3 100644
--- a/documentation/current/_templates/UnderConstruction.tpl
+++ b/documentation/current/_templates/UnderConstruction.tpl
@@ -1 +1 @@
-<center><p style="text-align:center; width: 500px; border: 1px solid #FFB55F; padding: 10px; background-color: #FFEEBF; color: black;">[[Image:LogoConstruction|24px]] '''Under construction:''' Caution! This page is currently under development. You can help by becoming a [[Community|contributor]].</p></center>
+<center class="doc-tpl-box"><p style="text-align:center; width: 500px; border: 1px solid #FFB55F; padding: 10px; background-color: #FFEEBF; color: black;">[[Image:LogoConstruction|24px]] '''Under construction:''' Caution! This page is currently under development. You can help by becoming a [[Community|contributor]].</p></center>
diff --git a/documentation/current/_templates/UnderConstruction.tpl.data b/documentation/current/_templates/UnderConstruction.tpl.data
index 82855743..a6cdf642 100644
--- a/documentation/current/_templates/UnderConstruction.tpl.data
+++ b/documentation/current/_templates/UnderConstruction.tpl.data
@@ -1,3 +1,3 @@
 title=UnderConstruction
-author=halw
+author=admin
 path=content/underconstruction
diff --git a/documentation/current/_templates/UpdateNeeded.tpl b/documentation/current/_templates/UpdateNeeded.tpl
index fe97fa8f..6a4903c4 100644
--- a/documentation/current/_templates/UpdateNeeded.tpl
+++ b/documentation/current/_templates/UpdateNeeded.tpl
@@ -1 +1 @@
-<center><p style="text-align:center; width: 500px; border: 1px solid #FFB55F; padding: 10px; background-color: #FFEEBF; color: black;">[[Image:LogoUpdateNeeded|24px]] '''Update Needed: '''Be careful. This page has been identified as needing update. You can help update it by becoming a [[Community|contributor]].</p></center>
+<center class="doc-tpl-box"><p style="text-align:center; width: 500px; border: 1px solid #FFB55F; padding: 10px; background-color: #FFEEBF; color: black;">[[Image:LogoUpdateNeeded|24px]] '''Update Needed: '''Be careful. This page has been identified as needing update. You can help update it by becoming a [[Community|contributor]].</p></center>
diff --git a/documentation/current/_templates/UpdateNeeded.tpl.data b/documentation/current/_templates/UpdateNeeded.tpl.data
index 8be37e6f..3d9d6408 100644
--- a/documentation/current/_templates/UpdateNeeded.tpl.data
+++ b/documentation/current/_templates/UpdateNeeded.tpl.data
@@ -1,3 +1,3 @@
 title=UpdateNeeded
-author=halw
+author=admin
 path=content/updateneeded
diff --git a/documentation/current/eiffelstudio/_images/address-toolbar.png b/documentation/current/eiffelstudio/_images/address-toolbar.png
new file mode 100644
index 00000000..e7c5e047
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/address-toolbar.png differ
diff --git a/documentation/current/eiffelstudio/_images/address-toolbar.png.data b/documentation/current/eiffelstudio/_images/address-toolbar.png.data
new file mode 100644
index 00000000..cf65d59f
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/address-toolbar.png.data
@@ -0,0 +1,3 @@
+title=address-toolbar
+author=halw
+path=content/address-toolbar