diff --git a/front/maintenance.php b/front/maintenance.php
index 662ab561..ee7fe6dd 100644
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -363,11 +363,13 @@ if (submit && isset($_POST['langselector_set'])) {
 
 <div class="box">
     <div class="box-body" style="text-align: center;">
-        <h5 class="text-aqua" style="font-size: 16px;"><?php echo $pia_lang['Maintenance_Github_package_a'];?>
-          <?php
-            echo "TODO";
-          ?>       
-          <?php echo $pia_lang['Maintenance_Github_package_b'];?>
+        <h5 class="text-aqua" style="font-size: 16px;">
+          <span>
+            <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/jokob-sk/pi.alert/main?logo=github&amp;style=plastic">
+          </span>
+          <span>
+            <img alt="Docker last pushed" src="https://img.shields.io/badge/dynamic/json?color=blue&label=Last%20pushed&query=last_updated&url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fjokobsk%2Fpi.alert%2F&logo=docker&?link=http://left&link=https://hub.docker.com/repository/docker/jokobsk/pi.alert">
+          </span>          
       </h5>
   </div>
 </div>
diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index d224aff5..9d64836a 100644
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -233,6 +233,10 @@ function show_pia_servertime() {
         <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
           <a href="maintenance.php"><i class="fa fa-cog"></i> <span><?php echo $pia_lang['Navigation_Maintenance'];?></span></a>
         </li>
+
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('help_faq.php') ) ){ echo 'active'; } ?>">
+          <a href="help_faq.php"><i class="fa fa-question"></i> <span><?php echo $pia_lang['Navigation_HelpFAQ'];?></span></a>
+        </li>
 <!--
         <li class="treeview">
           <a href="#"><i class="fa fa-link"></i> <span>Config</span>
diff --git a/front/php/templates/language/de_de.php b/front/php/templates/language/de_de.php
index 87fd7b5c..1745522a 100644
--- a/front/php/templates/language/de_de.php
+++ b/front/php/templates/language/de_de.php
@@ -356,7 +356,7 @@ $pia_lang['HelpFAQ_Cat_Device_200_text'] = 'Wenn du Pi-hole verwendest, beachte
          									lösche ggf. die betreffende DHCP-Lease. Anschließend schaue, ebenfalls in Pi-hole, unter Tools -> Network, ob sich dort die immer wiederkehrenden Hosts finden lassen. 
          									Wenn ja, lösche diese dort ebenfalls. Nun kannst du Pi.Alert wieder starten. Jetzt sollte das Gerät/die Geräte nicht mehr auftauchen.';
 $pia_lang['HelpFAQ_Cat_Detail_300_head'] = 'Was bedeutet ';
-$pia_lang['HelpFAQ_Cat_Detail_300_text_a'] = 'meint ein Netzwerkgerät, welches über die Netzwerk-Seite erstellt wurde.';
+$pia_lang['HelpFAQ_Cat_Detail_300_text_a'] = 'meint ein Netzwerkgerät (welches den typ AP, Gateway, Powerline, Switch, WLAN, PLC, Router,USB LAN Adapter, USB WIFI Adapter, or Internet eingestellt hat)';
 $pia_lang['HelpFAQ_Cat_Detail_300_text_b'] = 'bezeichnet die Anschlussnummer/Portnummer, an der das gerade bearbeitete Gerät mit diesem Netzwerkgerät verbunden ist.';
 $pia_lang['HelpFAQ_Cat_Detail_301_head_a'] = 'Wann wird nun gescannt? Bei ';
 $pia_lang['HelpFAQ_Cat_Detail_301_head_b'] = ' steht 1min aber der Graph zeigt 5min - Abstände an.';
@@ -380,6 +380,6 @@ $pia_lang['HelpFAQ_Cat_Presence_401_text'] = 'Wenn dies geschieht hast du die M
 $pia_lang['HelpFAQ_Cat_Network_600_head'] = 'Was bringt mir diese Seite?';
 $pia_lang['HelpFAQ_Cat_Network_600_text'] = 'Diese Seite soll dir die Möglichkeit bieten, die Belegung deiner Netzwerkgeräte abzubilden. Dazu kannst du einen oder mehrere Switches, WLANs, Router, etc. erstellen,
         									 sie ggf. mit einer Portanzahl versehen und bereits erkannte Geräte diesen zuordnen. Diese Zuordnung erfolgt in der Detailansicht, des zuzuordnenden Gerätes. So ist es dir möglich, schnell festzustellen 
-        									 an welchem Port ein Host angeschlossen und ob er online ist. Es ist möglich ein Gerät mehreren Ports (bei Portbündelung), als auch mehrere Geräte einem Port (virtuelle Maschinen), zuzuordnen.';
+        									 an welchem Port ein Host angeschlossen und ob er online ist.';
 
 ?>
\ No newline at end of file
diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php
index 918de00b..0f761fe6 100644
--- a/front/php/templates/language/en_us.php
+++ b/front/php/templates/language/en_us.php
@@ -341,9 +341,9 @@ $pia_lang['Network_UnassignedDevices'] = 'Unassigned devices';
 // Help Page
 //////////////////////////////////////////////////////////////////
 
-$pia_lang['HelpFAQ_Title'] = 'Hilfe / FAQ';
-$pia_lang['HelpFAQ_Cat_General'] = 'Allgemein';
-$pia_lang['HelpFAQ_Cat_Detail'] = 'Detailsansicht';
+$pia_lang['HelpFAQ_Title'] = 'Help / FAQ';
+$pia_lang['HelpFAQ_Cat_General'] = 'General';
+$pia_lang['HelpFAQ_Cat_Detail'] = 'Details';
 $pia_lang['HelpFAQ_Cat_General_100_head'] = 'The clock on the top right and the times of the events/presence are not correct (time difference).';
 $pia_lang['HelpFAQ_Cat_General_100_text_a'] = 'On your PC the following time zone is set for the PHP environment:';
 $pia_lang['HelpFAQ_Cat_General_100_text_b'] = 'If this is not the timezone you are in, you should change the timezone in the PHP configuration file. You can find it in this directory:';
@@ -369,7 +369,7 @@ $pia_lang['HelpFAQ_Cat_Device_200_text'] = 'If you use Pi-hole, please note that
          									delete the DHCP lease if necessary. Then, also in Pi-hole, look under Tools -> Network to see if you can find the recurring hosts there. 
          									If yes, delete them there as well. Now you can start Pi.Alert again. Now the device(s) should not show up anymore.';
 $pia_lang['HelpFAQ_Cat_Detail_300_head'] = 'What means ';
-$pia_lang['HelpFAQ_Cat_Detail_300_text_a'] = 'means a network device created from the network page.';
+$pia_lang['HelpFAQ_Cat_Detail_300_text_a'] = 'means a network device (a device of the type AP, Gateway, Powerline, Switch, WLAN, PLC, Router,USB LAN Adapter, USB WIFI Adapter, or Internet).';
 $pia_lang['HelpFAQ_Cat_Detail_300_text_b'] = 'designates the port number where the currently edited device is connected to this network device.';
 $pia_lang['HelpFAQ_Cat_Detail_301_head_a'] = 'When is scanning now? At ';
 $pia_lang['HelpFAQ_Cat_Detail_301_head_b'] = ' says 1min but the graph shows 5min intervals.';
@@ -392,7 +392,6 @@ $pia_lang['HelpFAQ_Cat_Presence_401_text'] = 'If this happens, you have the poss
 											  and then simply switch the device off again. Now Pi.Alert should properly note the state of the device in the database with the next scan.';
 $pia_lang['HelpFAQ_Cat_Network_600_head'] = 'What is this page for?';
 $pia_lang['HelpFAQ_Cat_Network_600_text'] = 'This page should offer you the possibility to map the assignment of your network devices. For this purpose, you can create one or more switches, WLANs, routers, etc., provide them with a port number if necessary and assign already detected 
-											 devices to them. This assignment is done in the detailed view of the device to be assigned. So it is possible for you to quickly determine to which port a host is connected and if it is online. It is possible to assign a device to multiple 
-											 ports (port bundling), as well as multiple devices to one port (virtual machines).';
+											 devices to them. This assignment is done in the detailed view of the device to be assigned. So it is possible for you to quickly determine to which port a host is connected and if it is online.';
 
 ?>
\ No newline at end of file