diff --git a/system_status/server.py b/system_status/server.py
index 49a24c5..d5493d4 100644
--- a/system_status/server.py
+++ b/system_status/server.py
@@ -125,7 +125,10 @@ def get_prometheus_data() -> list[PrometheusData]:
 
             timestamps_and_values = []
             for epoch_time, value in maybe_values:
-                timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(epoch_time))
+                utc_dt = datetime.datetime.fromtimestamp(epoch_time, datetime.timezone.utc)
+                pst_tz = ZoneInfo("America/Los_Angeles")
+                pst_dt = utc_dt.astimezone(pst_tz)
+                timestamp = pst_dt.strftime("%Y-%m-%d %H:%M:%S %Z")
                 timestamps_and_values.append(TimestampAndValuePair(timestamp, value))
 
             # the service is up if the maximum timestamp's value is "1"
diff --git a/system_status/templates/my_template.html b/system_status/templates/my_template.html
index 44a2049..e0d7a19 100644
--- a/system_status/templates/my_template.html
+++ b/system_status/templates/my_template.html
@@ -122,11 +122,13 @@ <h2 id="fetch_time">Fetch Time: {{ fetch_time }}</h2>
                 {# THIS IS THE CORRECTED SECTION for the EMOJI HISTORY #}
                 <td>
                     {% for value in item.values %}
+                    <span title="{{value.timestamp}}" style="cursor: help">
                         {% if value.value == "1" %}
                             ✅
                         {% else %}
                             ❌
                         {% endif %}
+                    </span>
                         {# the below if-statement adds a vertical line for every four entries #}
                         {% if (not loop.index % 4) and loop.index < 24%}
                             |