diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 6ffdff08e..ec9653088 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -181,3 +181,16 @@ define('AUTH_MODULE', 'db');
 // A comma-separated list of default plugins for new group registrations.
 // Example below enables charts and attachments.
 // define('DEFAULT_PLUGINS', 'ch,at');
+
+// Panegyris Config Edits - https://panegyris.com
+
+
+// GROUP_DATE_FORMAT_LIST_SEPARATOR - separator to explode this array on (see group_edit.php)
+//
+// GROUP_DATE_FORMAT_LIST - allow group date formats to be modified/extended without having to modify code
+// This will be exploded into an array at processing time so it's "key","value" (double quotes due to single quote in define)
+//  "smarty date format","human format"
+
+
+define("GROUP_DATE_FORMAT_LIST_SEPARATOR", '^^');
+define('GROUP_DATE_FORMAT_LIST','"%Y-%m-%d","Y-m-d"^^"%m/%d/%Y","m/d/Y"^^"%d-%m-%Y","d-m-Y"^^"%d.%m.%Y","d.m.Y"^^"%d.%m.%Y %a","d.m.Y a"^^"%m/%d/%Y (%a)","mm/dd/yyyy (day)"');
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 0c1b8e0a9..b4511ddff 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -429,8 +429,8 @@
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
 'form.reset_password.message' => 'Password reset request sent by email.',
-'form.reset_password.email_subject' => 'Anuko Time Tracker password reset request',
-'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Anuko Time Tracker password reset. Please visit this link if you want to reset your password.\n\n%s\n\nAnuko Time Tracker is a simple, easy to use, open source time tracking system. Visit https://www.anuko.com for more information.\n\n",
+'form.reset_password.email_subject' => 'Time Tracker password reset request',
+'form.reset_password.email_body' => "Dear User,\n\nSomeone from IP %s requested your Time Tracker password reset. Please visit this link if you want to reset your password.",
 
 // Changing Password form. See example at https://timetracker.anuko.com/password_change.php?ref=1.
 'form.change_password.tip' => 'Type new password and click on Save.',
diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 837ef05b3..c2ac2950b 100644
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -95,8 +95,6 @@
     {if $user->can('manage_features')}
             <a class="systemMenu" href="plugins.php">{$i18n.menu.plugins}</a>
     {/if}
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
       </table>
@@ -161,8 +159,6 @@
   {if isTrue('MULTIORG_MODE') && $smarty.const.AUTH_MODULE == 'db'}
             <a class="systemMenu" href="register.php">{$i18n.menu.register}</a>
   {/if}
-            <a class="systemMenu" href="{$smarty.const.FORUM_LINK}" target="_blank">{$i18n.menu.forum}</a>
-            <a class="systemMenu" href="{$smarty.const.HELP_LINK}" target="_blank">{$i18n.menu.help}</a>
           </td>
         </tr>
       </table>
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl
index ec0b05926..31d8d8077 100644
--- a/WEB-INF/templates/mobile/header.tpl
+++ b/WEB-INF/templates/mobile/header.tpl
@@ -73,6 +73,9 @@
       <table id="sub_menu_authorized_user" cellspacing="0" cellpadding="3" width="100%" border="0">
         <tr>
           <td align="center" bgcolor="#d9d9d9" height="17" style="background-repeat: repeat-x;" background="../images/subm_bg.gif">&nbsp;
+    <!-- Added by Panegyris https://panegyris.com -->
+    <a class="mainMenu" href="../logout.php">{$i18n.menu.logout}</a>
+
     {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))}
            <a class="mainMenu" href="time.php">{$i18n.menu.time}</a>
     {/if}
@@ -97,6 +100,16 @@
       <!-- end of sub menu for authorized user -->
   {/if}
 {/if}
+
+    <!-- Added by Panegyris https://panegyris.com -->
+      <!-- page title and user details -->
+{if $title}
+      <table id="page_title" cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
+        <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
+        <tr><td>{$user->getUserPartForHeader()}</td></tr> {* No need to escape as it is done in the class. *}
+      </table>
+{/if}
+      <!-- end of page title and user details -->
       
       <!-- output errors -->
 {if $err->yes()}
diff --git a/WEB-INF/templates/time_script.tpl b/WEB-INF/templates/time_script.tpl
index 3e8a02024..32247a581 100644
--- a/WEB-INF/templates/time_script.tpl
+++ b/WEB-INF/templates/time_script.tpl
@@ -69,6 +69,13 @@ function fillDropdowns() {
     fillProjectDropdown(document.timeRecordForm.client.value);
 
   fillTaskDropdown(document.timeRecordForm.project.value);
+  
+  // Panegyris ++++
+  // This doesn't really belong here but the onload() doesn't point to a general onload() handler.
+  // -- minimize the number of changes right now.
+  formDisable('start');
+  formDisable('finish');
+  // Panegyris ----
 }
 
 // The fillProjectDropdown function populates the project combo box with
@@ -166,6 +173,21 @@ function fillTaskDropdown(id) {
   }
 }
 
+// Panegyris ++++
+// Adapt entry times to 24hr as needed
+function adaptTime(inTime) {
+  var newDate = new Date(Date.parse("01/01/01 "+inTime));
+  var hours = newDate.getHours();
+  var minutes = newDate.getMinutes();
+  var leadingZero = (minutes < 10 ? "0" : "");
+  var newTime = hours+":"+leadingZero+minutes+":00";
+  
+  return newTime;
+}
+// Panegyris ----
+
+
+
 // The formDisable function disables some fields depending on what we have in other fields.
 function formDisable(formField) {
   var formFieldValue = eval("document.timeRecordForm." + formField + ".value");
@@ -177,6 +199,33 @@ function formDisable(formField) {
     x.value = "";
     x.disabled = true;
     x.style.background = "#e9e9e9";
+
+
+    // Panegyris ++++ Dynamic computation of duration -- hackery!    
+    var startDateValue = eval("document.timeRecordForm.start.value");
+    var endDateValue = eval("document.timeRecordForm.finish.value");
+
+    // Only compute a duration after both entries made
+    if ((startDateValue != "") && (endDateValue != "")) {
+
+      var normalizedStart = adaptTime(startDateValue);
+      var normalizedEnd = adaptTime(endDateValue);
+      
+      var startDate = Date.parse("01/01/01 "+normalizedStart);
+      var endDate = Date.parse("01/01/01 "+normalizedEnd);
+        
+      var timeDifferenceInMS = endDate - startDate;
+      var timeDifferenceInS = Math.floor(timeDifferenceInMS/1000);
+
+      var hours = Math.floor(timeDifferenceInS / 3600);
+      var minutes = Math.floor((timeDifferenceInS - (hours*3600)) / 60);
+      var leadingZero = (minutes < 10 ? "0" : "");
+
+      x.value = hours+":"+leadingZero+minutes;
+    }
+    
+    // Panegyris ++++
+
   }
 
   if (((formFieldValue == "") && (formFieldName == "start") && (document.timeRecordForm.finish.value == "")) || ((formFieldValue == "") && (formFieldName == "finish") && (document.timeRecordForm.start.value == ""))) {
diff --git a/group_edit.php b/group_edit.php
index c4fdc2174..62c15ae83 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -154,6 +154,21 @@
   array('id'=>'%d-%m-%Y','name'=>'d-m-Y'),
   array('id'=>'%d.%m.%Y','name'=>'d.m.Y'),
   array('id'=>'%d.%m.%Y %a','name'=>'d.m.Y a'));
+
+// Panegyris ++++
+if (defined('GROUP_DATE_FORMAT_LIST_SEPARATOR') && defined('GROUP_DATE_FORMAT_LIST')) {
+  $DATE_FORMAT_OPTIONS = array();
+  $DATE_FORMAT_OPTIONS_ARRAY = explode(GROUP_DATE_FORMAT_LIST_SEPARATOR, GROUP_DATE_FORMAT_LIST);
+  foreach($DATE_FORMAT_OPTIONS_ARRAY as $formatPair) {
+    $formatArray = explode(',', $formatPair);
+    $key = str_replace('"', "", $formatArray[0]);
+    $value = str_replace('"', "", $formatArray[1]);
+    array_push($DATE_FORMAT_OPTIONS, array('id'=> $key, 'name'=> $value));
+  }
+}
+// Panegyris ++++
+
+
 $form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
   'onchange'=>'MakeFormatPreview(&quot;date_format_preview&quot;, this);'));
 $TIME_FORMAT_OPTIONS = array(