diff --git a/src/main/resources/user_information.vm b/src/main/resources/user_information.vm
index 3b9fb14..fd55835 100644
--- a/src/main/resources/user_information.vm
+++ b/src/main/resources/user_information.vm
@@ -114,15 +114,15 @@
                 <th id="ti-users">User</th>
                 <th id="ti-team">Team</th>
                 <th id="ti-state">State</th>
-                <th id="ti-inactive-end-date">Inactive End Date</th>
+                <th id="ti-inactive-end-date" style="display:none;">Inactive End Date</th>
                 <th id="ti-remaining-hours">Remaining Hours</th>
                 <th id="ti-target-total-hours">Target Total Hours</th>
                 <th id="ti-total-hours">Finished Hours</th>
                 <th id="ti-hours-per-half-year">Hours last Half Year</th>
                 <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
                 <th id="ti-hours-per-last-monitoring-period">Hours ($lastMonitoringPeriod)</th>
-                <th id="ti-first-entry-date">Date of the First Entry</th>
-                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-first-entry-date">First Entry</th>
+                <th id="ti-latest-entry-date">Last Entry</th>
                 <th id="ti-latest-entry-description">Description of the Latest Entry</th>
                 <th id="ti-actions">Actions</th>
             </tr>
@@ -151,8 +151,8 @@
                 <th id="ti-hours-per-half-year">Hours last Half Year</th>
                 <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
                 <th id="ti-hours-per-last-monitoring-period">Hours ($lastMonitoringPeriod)</th>
-                <th id="ti-first-entry-date">Date of the First Entry</th>
-                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-first-entry-date">First Entry</th>
+                <th id="ti-latest-entry-date">Last Entry</th>
                 <th id="ti-latest-entry-description">Description of the Latest Entry</th>
                 <th id="ti-actions">Actions</th>
             </tr>
@@ -174,15 +174,15 @@
                 <th id="ti-users">User</th>
                 <th id="ti-team">Team</th>
                 <th id="ti-state">State</th>
-                <th id="ti-inactive-end-date">Inactive End Date</th>
+                <th id="ti-inactive-end-date" style="display:none;">Inactive End Date</th>
                 <th id="ti-remaining-hours">Remaining Hours</th>
                 <th id="ti-target-total-hours">Target Total Hours</th>
                 <th id="ti-total-hours">Finished Hours</th>
                 <th id="ti-hours-per-half-year">Hours last Half Year</th>
                 <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
                 <th id="ti-hours-per-last-monitoring-period">Hours ($lastMonitoringPeriod)</th>
-                <th id="ti-first-entry-date">Date of the First Entry</th>
-                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-first-entry-date">First Entry</th>
+                <th id="ti-latest-entry-date">Last Entry</th>
                 <th id="ti-latest-entry-description">Description of the Latest Entry</th>
                 <th id="ti-actions">Actions</th>
             </tr>
@@ -204,15 +204,15 @@
                 <th id="ti-users">User</th>
                 <th id="ti-team">Team</th>
                 <th id="ti-state">State</th>
-                <th id="ti-inactive-end-date">Inactive End Date</th>
+                <th id="ti-inactive-end-date" style="display:none;">Inactive End Date</th>
                 <th id="ti-remaining-hours">Remaining Hours</th>
                 <th id="ti-target-total-hours">Target Total Hours</th>
                 <th id="ti-total-hours">Finished Hours</th>
                 <th id="ti-hours-per-half-year">Hours last Half Year</th>
                 <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
                 <th id="ti-hours-per-last-monitoring-period">Hours ($lastMonitoringPeriod)</th>
-                <th id="ti-first-entry-date">Date of the First Entry</th>
-                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-first-entry-date">First Entry</th>
+                <th id="ti-latest-entry-date">Last Entry</th>
                 <th id="ti-latest-entry-description">Description of the Latest Entry</th>
                 <th id="ti-actions">Actions</th>
             </tr>
@@ -234,15 +234,15 @@
                 <th id="ti-users">User</th>
                 <th id="ti-team">Team</th>
                 <th id="ti-state">State</th>
-                <th id="ti-inactive-end-date">Inactive End Date</th>
+                <th id="ti-inactive-end-date" style="display:none;">Inactive End Date</th>
                 <th id="ti-remaining-hours">Remaining Hours</th>
                 <th id="ti-target-total-hours">Target Total Hours</th>
                 <th id="ti-total-hours">Finished Hours</th>
                 <th id="ti-hours-per-half-year">Hours last Half Year</th>
                 <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
                 <th id="ti-hours-per-last-monitoring-period">Hours ($lastMonitoringPeriod)</th>
-                <th id="ti-first-entry-date">Date of the First Entry</th>
-                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-first-entry-date">First Entry</th>
+                <th id="ti-latest-entry-date">Last Entry</th>
                 <th id="ti-latest-entry-description">Description of the Latest Entry</th>
                 <th id="ti-actions">Actions</th>
             </tr>
@@ -264,15 +264,15 @@
                 <th id="ti-users">User</th>
                 <th id="ti-team">Team</th>
                 <th id="ti-state">State</th>
-                <th id="ti-inactive-end-date">Inactive End Date</th>
+                <th id="ti-inactive-end-date" style="display:none;">Inactive End Date</th>
                 <th id="ti-remaining-hours">Remaining Hours</th>
                 <th id="ti-target-total-hours">Target Total Hours</th>
                 <th id="ti-total-hours">Finished Hours</th>
                 <th id="ti-hours-per-half-year">Hours last Half Year</th>
                 <th id="ti-hours-per-monitoring-period">Hours ($monitoringPeriod)</th>
                 <th id="ti-hours-per-last-monitoring-period">Hours ($lastMonitoringPeriod)</th>
-                <th id="ti-first-entry-date">Date of the First Entry</th>
-                <th id="ti-latest-entry-date">Date of the Latest Entry</th>
+                <th id="ti-first-entry-date">First Entry</th>
+                <th id="ti-latest-entry-date">Last Entry</th>
                 <th id="ti-latest-entry-description">Description of the Latest Entry</th>
                 <th id="ti-enabled">Timesheet Enabled</th>
             </tr>