diff --git a/.gitignore b/.gitignore
index c4e2458..fdfd3f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,11 @@ vendor/
 volumes/node-red/
 main
 
+bridge
+decoder
+server
+location
+
 **/*.log
 
 ROADMAP.md
diff --git a/bridge b/bridge
deleted file mode 100755
index f7c7b21..0000000
Binary files a/bridge and /dev/null differ
diff --git a/decoder b/decoder
deleted file mode 100755
index b6248de..0000000
Binary files a/decoder and /dev/null differ
diff --git a/internal/pkg/common/appcontext/health.go b/internal/pkg/common/appcontext/health.go
index b804eab..b9cda36 100644
--- a/internal/pkg/common/appcontext/health.go
+++ b/internal/pkg/common/appcontext/health.go
@@ -9,7 +9,7 @@ import (
 
 // ServiceStatus represents the health of an external service (e.g. Kafka, database).
 type ServiceStatus struct {
-	Status  string `json:"status"`  // "up", "down", "unknown"
+	Status  string `json:"status"` // "up", "down", "unknown"
 	Message string `json:"message,omitempty"`
 }
 
@@ -56,6 +56,7 @@ func (b *BaseHealth) GetActiveWriters(m *kafkaclient.KafkaManager) {
 
 func (b *BaseHealth) GetActiveBeacons(m *AppState) {
 	beacons := m.GetAllBeacons()
+	b.ActiveBeacons = []string{}
 	for beacon := range beacons {
 		b.ActiveBeacons = append(b.ActiveBeacons, beacon)
 	}
diff --git a/internal/pkg/model/alerts.go b/internal/pkg/model/alerts.go
index 093bc24..d9df5f1 100644
--- a/internal/pkg/model/alerts.go
+++ b/internal/pkg/model/alerts.go
@@ -3,9 +3,10 @@ package model
 import "time"
 
 type Alert struct {
-	ID        string    `json:"id" gorm:"primaryKey"`
-	TrackerID string    `json:"tracker_id"`
-	Type      string    `json:"type"`
-	Status    string    `json:"status"`
-	Timestamp time.Time `json:"timestamp"`
+	ID                  string    `json:"id" gorm:"primaryKey"`
+	TrackerID           string    `json:"tracker_id"`
+	Type                string    `json:"type"`
+	Status              string    `json:"status"`
+	Timestamp           time.Time `json:"timestamp"`
+	ResolutionTimestamp time.Time `json:"resolution_timestamp"`
 }
diff --git a/location b/location
deleted file mode 100755
index 14dc7e9..0000000
Binary files a/location and /dev/null differ
diff --git a/server b/server
deleted file mode 100755
index ee06424..0000000
Binary files a/server and /dev/null differ