diff --git a/Data/Server/WebUI/src/Device_Details.jsx b/Data/Server/WebUI/src/Device_Details.jsx
index b6cfffa..ba3fe93 100644
--- a/Data/Server/WebUI/src/Device_Details.jsx
+++ b/Data/Server/WebUI/src/Device_Details.jsx
@@ -82,7 +82,7 @@ export default function DeviceDetails({ device, onBack }) {
       let [hh, mm, ss] = timePart.split(":").map(Number);
       const ampm = hh >= 12 ? "PM" : "AM";
       hh = hh % 12 || 12;
-      return `${m.toString().padStart(2, "0")}/${d.toString().padStart(2, "0")}/${y} - ${hh}:${mm
+      return `${m.toString().padStart(2, "0")}/${d.toString().padStart(2, "0")}/${y} @ ${hh}:${mm
         .toString()
         .padStart(2, "0")}${ampm}`;
     } catch {
diff --git a/Data/Server/WebUI/src/Navigation_Sidebar.jsx b/Data/Server/WebUI/src/Navigation_Sidebar.jsx
index cabf7cd..ac05306 100644
--- a/Data/Server/WebUI/src/Navigation_Sidebar.jsx
+++ b/Data/Server/WebUI/src/Navigation_Sidebar.jsx
@@ -92,28 +92,6 @@ function NavigationSidebar({ currentPage, onNavigate }) {
           </AccordionDetails>
         </Accordion>
 
-        {/* Filters & Groups */}
-        <Accordion
-          expanded={expandedNav.filters}
-          onChange={(_, e) => setExpandedNav((s) => ({ ...s, filters: e }))}
-          square
-          disableGutters
-          sx={{ "&:before": { display: "none" }, margin: 0, border: 0 }}
-        >
-          <AccordionSummary
-            expandIcon={<ExpandMoreIcon />}
-            sx={{ backgroundColor: "#2c2c2c", minHeight: "36px", "& .MuiAccordionSummary-content": { margin: 0 } }}
-          >
-            <Typography sx={{ fontSize: "0.9rem", color: "#0475c2" }}>
-              <b>Filters & Groups</b>
-            </Typography>
-          </AccordionSummary>
-          <AccordionDetails sx={{ p: 0, bgcolor: "#232323" }}>
-            <NavItem icon={<FilterIcon fontSize="small" />} label="Filters" pageKey="filters" />
-            <NavItem icon={<GroupsIcon fontSize="small" />} label="Groups" pageKey="groups" />
-          </AccordionDetails>
-        </Accordion>
-
         {/* Automation */}
         <Accordion
           expanded={expandedNav.automation}
@@ -137,6 +115,28 @@ function NavigationSidebar({ currentPage, onNavigate }) {
             <NavItem icon={<CommunityIcon fontSize="small" />} label="Community Content" pageKey="community" />
           </AccordionDetails>
         </Accordion>
+
+        {/* Filters & Groups */}
+        <Accordion
+          expanded={expandedNav.filters}
+          onChange={(_, e) => setExpandedNav((s) => ({ ...s, filters: e }))}
+          square
+          disableGutters
+          sx={{ "&:before": { display: "none" }, margin: 0, border: 0 }}
+        >
+          <AccordionSummary
+            expandIcon={<ExpandMoreIcon />}
+            sx={{ backgroundColor: "#2c2c2c", minHeight: "36px", "& .MuiAccordionSummary-content": { margin: 0 } }}
+          >
+            <Typography sx={{ fontSize: "0.9rem", color: "#0475c2" }}>
+              <b>Filters & Groups</b>
+            </Typography>
+          </AccordionSummary>
+          <AccordionDetails sx={{ p: 0, bgcolor: "#232323" }}>
+            <NavItem icon={<FilterIcon fontSize="small" />} label="Filters" pageKey="filters" />
+            <NavItem icon={<GroupsIcon fontSize="small" />} label="Groups" pageKey="groups" />
+          </AccordionDetails>
+        </Accordion>
       </Box>
     </Box>
   );