diff --git a/code/html/index.html b/code/html/index.html
index d725bca1..675a5a98 100644
--- a/code/html/index.html
+++ b/code/html/index.html
@@ -127,6 +127,10 @@
                             <a href="#" class="pure-menu-link" data="panel-mqtt">MQTT</a>
                         </li>
 
+                        <li class="pure-menu-item module module-nofuss">
+                            <a href="#" class="pure-menu-link" data="panel-nofuss">NOFUSS</a>
+                        </li>
+
                         <li class="pure-menu-item module module-ntp">
                             <a href="#" class="pure-menu-link" data="panel-ntp">NTP</a>
                         </li>
@@ -616,18 +620,6 @@
                                     <div class="pure-u-1 pure-u-lg-3-4 hint">Request password when starting telnet session</div>
                                 </div>
 
-                                <div class="pure-g module module-nofuss">
-                                    <label class="pure-u-1 pure-u-lg-1-4">Automatic remote updates (NoFUSS)</label>
-                                    <div class="pure-u-1 pure-u-lg-1-4"><input type="checkbox" name="nofussEnabled" /></div>
-                                </div>
-
-                                <div class="pure-g module module-nofuss">
-                                    <label class="pure-u-1 pure-u-lg-1-4">NoFUSS server</label>
-                                    <input name="nofussServer" class="pure-u-1 pure-u-lg-3-4" type="text" tabindex="15" />
-                                    <div class="pure-u-0 pure-u-lg-1-4"></div>
-                                    <div class="pure-u-1 pure-u-lg-3-4 hint">This name address of the NoFUSS server for automatic remote updates (see https://bitbucket.org/xoseperez/nofuss).</div>
-                                </div>
-
                                 <div class="pure-g">
                                     <label class="pure-u-1 pure-u-lg-1-4">Upgrade</label>
                                     <input class="pure-u-1-2 pure-u-lg-1-2" name="filename" type="text" readonly />
@@ -914,6 +906,33 @@
                     </div>
                 </form>
 
+                <form id="form-nofuss" class="pure-form form-settings">
+                    <div class="panel" id="panel-nofuss">
+
+                        <div class="header">
+                            <h1>NoFUSS</h1>
+                            <h2>Automatically upgrade the firmware (see <a href="https://bitbucket.org/xoseperez/nofuss">xoseperez/nofuss</a> for details)</h2>
+                        </div>
+
+                        <div class="page">
+                            <fieldset>
+                                <div class="pure-g">
+                                    <label class="pure-u-1 pure-u-lg-1-4">Enable</label>
+                                    <div class="pure-u-1 pure-u-lg-1-4"><input type="checkbox" name="nofussEnabled" /></div>
+                                </div>
+
+                                <div class="pure-g">
+                                    <label class="pure-u-1 pure-u-lg-1-4">Server</label>
+                                    <input name="nofussServer" class="pure-u-1 pure-u-lg-3-4" type="text" tabindex="15" />
+                                    <div class="pure-u-0 pure-u-lg-1-4"></div>
+                                    <div class="pure-u-1 pure-u-lg-3-4 hint">Address of the NoFUSS server</div>
+                                </div>
+                            </fieldset>
+                        </div>
+
+                    </div>
+                </form>
+
                 <form id="form-ntp" class="pure-form form-settings">
                     <div class="panel" id="panel-ntp">