diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index e95ba18f..2cfe391b 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -154,7 +154,7 @@
                             Clicking on the button below will download all docker containers and start them. This can take a lot of time depending on your internect connection. Since the overall size is a few GB, this will take around 5-10 min or more. So be aware and patient!<br><br>
                         {% endif %}
                         {% if is_mastercontainer_update_available == true %}
-                            ⚠ Please update your mastercontainer. Afterwards, you will be able to start your containers again.<br><br>
+                            ⚠ Please update your mastercontainer. (The update button is in the Mastercontainer section below the Backup section. Click <a href="#mastercontainer"><b>here</b><a/> to go there.) Afterwards, you will be able to start your containers again.<br><br>
                         {% else %}
                             {% if was_start_button_clicked == false or has_update_available == false %}
                                 <form method="POST" action="/api/docker/start" class="xhr">
@@ -174,43 +174,6 @@
                 {% endif %}
 
                 {% if was_start_button_clicked == true %}
-                    
-                    {% if isBackupOrRestoreRunning == false %}
-                        <h2>Mastercontainer</h2>
-                        You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
-
-                        {% if is_mastercontainer_update_available == true %}
-                            {% if isAnyRunning == false %}
-                                ⚠ A mastercontainer update is available. Please click on the button below to update it.<br><br>
-                                <form method="POST" action="/api/docker/watchtower" class="xhr">
-                                    <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
-                                    <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
-                                    <input class="button" type="submit" value="Update mastercontainer" />
-                                </form>
-                            {% else %}
-                                ⚠ A mastercontainer update is available. Please stop your containers in order to be able to update the mastercontainer.<br><br>
-                            {% endif %}
-                            {% if current_channel starts with 'latest' %}
-                                You can find the changelog <a href="https://github.com/nextcloud/all-in-one/releases/latest">here</a><br><br>
-                            {% elseif current_channel starts with 'beta' %}
-                                You can find the changelog <a href="https://github.com/nextcloud/all-in-one/releases">here</a><br><br>
-                            {% elseif current_channel starts with 'develop' %}
-                                You can find all changes <a href="https://github.com/nextcloud-releases/all-in-one/commits/main">here</a><br><br>
-                            {% endif %}
-                        {% endif %}
-                        {% if isApacheStarting == false %} 
-                            <h3>AIO password change</h3>
-                            You can change your AIO password below:<br><br />
-                            <form method="POST" action="/api/configuration" class="xhr">
-                                <input type="text" autocomplete="current-password" name="current-master-password" placeholder="your current aio password"/>
-                                <input type="text" autocomplete="new-password" name="new-master-password" placeholder="your new aio password"/>
-                                <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
-                                <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
-                                <input class="button" type="submit" value="Submit" />
-                            </form>
-                            The new password needs to be at least 24 characters long. Allowed characters are the <a href="https://en.wikipedia.org/wiki/Latin_alphabet#/media/File:Abecedarium.png">latin characters</a> 'a-z', 'A-Z', '0-9' and spaces.<br><br>
-                        {% endif %}
-                    {% endif %}
 
                     {% if isBackupOrRestoreRunning == false and borg_backup_host_location == "" and isApacheStarting != true %}
                         <h2>Backup and restore</h2>
@@ -285,6 +248,43 @@
                             <a href="" class="button reload">Reload ↻</a><br/>
                         {% endif %}
                     {% endif %}
+
+                    {% if isBackupOrRestoreRunning == false %}
+                        <h2 id="mastercontainer">Mastercontainer</h2>
+                        You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
+
+                        {% if is_mastercontainer_update_available == true %}
+                            {% if isAnyRunning == false %}
+                                ⚠ A mastercontainer update is available. Please click on the button below to update it.<br><br>
+                                <form method="POST" action="/api/docker/watchtower" class="xhr">
+                                    <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
+                                    <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
+                                    <input class="button" type="submit" value="Update mastercontainer" />
+                                </form>
+                            {% else %}
+                                ⚠ A mastercontainer update is available. Please stop your containers in order to be able to update the mastercontainer.<br><br>
+                            {% endif %}
+                            {% if current_channel starts with 'latest' %}
+                                You can find the changelog <a href="https://github.com/nextcloud/all-in-one/releases/latest">here</a><br><br>
+                            {% elseif current_channel starts with 'beta' %}
+                                You can find the changelog <a href="https://github.com/nextcloud/all-in-one/releases">here</a><br><br>
+                            {% elseif current_channel starts with 'develop' %}
+                                You can find all changes <a href="https://github.com/nextcloud-releases/all-in-one/commits/main">here</a><br><br>
+                            {% endif %}
+                        {% endif %}
+                        {% if isApacheStarting == false %} 
+                            <h3>AIO password change</h3>
+                            You can change your AIO password below:<br><br />
+                            <form method="POST" action="/api/configuration" class="xhr">
+                                <input type="text" autocomplete="current-password" name="current-master-password" placeholder="your current aio password"/>
+                                <input type="text" autocomplete="new-password" name="new-master-password" placeholder="your new aio password"/>
+                                <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
+                                <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
+                                <input class="button" type="submit" value="Submit" />
+                            </form>
+                            The new password needs to be at least 24 characters long. Allowed characters are the <a href="https://en.wikipedia.org/wiki/Latin_alphabet#/media/File:Abecedarium.png">latin characters</a> 'a-z', 'A-Z', '0-9' and spaces.<br><br>
+                        {% endif %}
+                    {% endif %}
                 {% endif %}
                 <h2>Optional</h2>
                 In this section, you will find optional addons in the future.