diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 5ebfa17b..161da168 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -27,6 +27,6 @@ labels: bug, 0. Needs triage
 
 #### Nextcloud AIO version <!--- (see Nextcloud AIO interface) -->
 
-#### Current channel <!--- (see the channel name in the Mastercontainer section) -->
+#### Current channel <!--- (see the channel name in the AIO interface) -->
 
 #### Other valuable info <!--- (like logs, screenshots & Co.) -->
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index abb03443..704440cf 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -51,7 +51,7 @@
         {% endfor %}
 
         {% if isWatchtowerRunning == true %}
-            <span class="status running"></span> Mastercontainer update currently running. It will restart the mastercontainer soon which will make it unavailable for a moment. Please wait until that's done. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br /><br />
+            <span class="status running"></span> Mastercontainer update currently running. It will restart the mastercontainer soon which will make it unavailable for a moment. Please wait until that's done. (<a href="/api/docker/logs?id=nextcloud-aio-watchtower">Logs</a>)<br /><br />
             <a href="" class="button reload">Reload ↻</a><br/>
         {% else %}
             {% if is_backup_container_running == false and domain == "" %}
@@ -86,7 +86,7 @@
                             {% if backup_exit_code > 0 %}
                                 <span class="status error"></span> Last {{ borg_backup_mode }} failed! (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
                                 {% if borg_backup_mode == 'test' %}
-                                    Please adjust the path and/or password in order to make it work! Afterwards click on 'Test path and password' button to verify the settings!<br><br>
+                                    Please adjust the path and/or password in order to make it work! After changing and submitting the values, click on 'Test path and password' button at the bottom of this page to verify and test the new settings!<br><br>
                                 {% elseif borg_backup_mode == 'check' %}
                                     The backup archive seems to be corrupt. Please try to use a different intact backup archive or try to fix it by following <a href="https://borgbackup.readthedocs.io/en/stable/faq.html?highlight=repair#:~:text=repairing%20a%20damaged%20repository"><b>this documentation</b></a>
                                 {% endif %}
@@ -144,6 +144,7 @@
                     {% endif %}
                 {% endif %}
             {% endif %}
+
             {% if is_backup_container_running == true %}
                 <span class="status running"></span> Backup container is currently running. (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup">Logs</a>)<br /><br />
                 <a href="" class="button reload">Reload ↻</a><br/><br>
@@ -151,7 +152,7 @@
 
             {% if domain != "" %}
                 {% if  was_start_button_clicked == true %}
-                    You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
+                    You are running the <b>{{ current_channel }}</b> channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
                 {% endif %}
 
                 {% if isAnyRunning == true %}
@@ -361,8 +362,8 @@
                 {% endif %}
                 {% if is_backup_container_running == false %}
                     <h2>Optional addons</h2>
-                    In this section, you can find optional addons.<br>
-                    You can enable or disaable them when your containers are stopped.<br><br>
+                    In this section you can find optional addons.<br>
+                    You can enable or disable them when your containers are stopped.<br><br>
                     <form id="options-form" method="POST" action="/api/configuration" class="xhr">
                         <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                         <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">