diff --git a/backup/manager.go b/backup/manager.go
index 5406ce6..bb2d29b 100644
--- a/backup/manager.go
+++ b/backup/manager.go
@@ -3,6 +3,7 @@ package backup
 import (
 	"os"
 	"path/filepath"
+	"sort"
 	"sync"
 	"time"
 
@@ -73,6 +74,10 @@ func (s *InstanceStatus) Snapshot() InstanceSnapshot {
 			LastBackupResult: db.LastBackupResult,
 		})
 	}
+	
+	sort.Slice(snap.Databases, func(i, j int) bool {
+		return snap.Databases[i].Name < snap.Databases[j].Name
+	})
 
 	return snap
 }
@@ -128,8 +133,10 @@ func (m *Manager) GetInstances() []*InstanceStatus {
 	defer m.mu.RUnlock()
 
 	var result []*InstanceStatus
-	for _, status := range m.instances {
-		result = append(result, status)
+	for _, instCfg := range m.cfg.Instances {
+		if status, exists := m.instances[instCfg.Name]; exists {
+			result = append(result, status)
+		}
 	}
 	return result
 }
@@ -251,6 +258,8 @@ func (m *Manager) RunInstance(name string) {
 		inst.mu.Unlock()
 		return
 	}
+	
+	sort.Strings(dbs)
 
 	inst.mu.Lock()
 	for _, db := range dbs {
diff --git a/web/server.go b/web/server.go
index faa66ba..92d3545 100644
--- a/web/server.go
+++ b/web/server.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"time"
 
@@ -32,7 +33,15 @@ type FileInfo struct {
 	Timestamp time.Time
 }
 
-type Inventory map[string]map[string][]FileInfo // Instance -> DB -> Files
+type DBInventory struct {
+	Name  string
+	Files []FileInfo
+}
+
+type InstanceInventory struct {
+	Name      string
+	Databases []DBInventory
+}
 
 func NewServer(cfg *config.Config, manager *backup.Manager) *Server {
 	s := &Server{
@@ -261,7 +270,7 @@ type TemplateData struct {
 	AnyRunning        bool
 	AuthEnabled       bool
 	Instances         []backup.InstanceSnapshot
-	Inventory         Inventory
+	Inventory         []InstanceInventory
 }
 
 func (s *Server) handleIndex(w http.ResponseWriter, r *http.Request) {
@@ -347,14 +356,14 @@ func (s *Server) handleRunInstance(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 }
 
-func (s *Server) getInventory() (Inventory, int64) {
-	inv := make(Inventory)
+func (s *Server) getInventory() ([]InstanceInventory, int64) {
+	var inv []InstanceInventory
 	instances := s.manager.GetInstances()
 	var totalSize int64
 
 	for _, inst := range instances {
 		instName := inst.Config.Name
-		inv[instName] = make(map[string][]FileInfo)
+		var dbInvs []DBInventory
 
 		entries, err := os.ReadDir(inst.Config.BackupDir)
 		if err != nil {
@@ -390,9 +399,19 @@ func (s *Server) getInventory() (Inventory, int64) {
 				totalSize += info.Size()
 			}
 			if len(fileInfos) > 0 {
-				inv[instName][dbName] = fileInfos
+				sort.Slice(fileInfos, func(i, j int) bool {
+					return fileInfos[i].Timestamp.After(fileInfos[j].Timestamp)
+				})
+				dbInvs = append(dbInvs, DBInventory{Name: dbName, Files: fileInfos})
 			}
 		}
+		
+		if len(dbInvs) > 0 {
+			sort.Slice(dbInvs, func(i, j int) bool {
+				return dbInvs[i].Name < dbInvs[j].Name
+			})
+			inv = append(inv, InstanceInventory{Name: instName, Databases: dbInvs})
+		}
 	}
 	return inv, totalSize
 }
diff --git a/web/templates/index.html b/web/templates/index.html
index 32aa0e6..4922638 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -357,36 +357,39 @@
         </div>
 
         {{if .Databases}}
-        <div class="table-responsive">
-            <table>
-                <thead>
-                    <tr>
-                        <th>Database</th>
-                        <th>First Discovered</th>
-                        <th>Last Backup Time</th>
-                        <th>Size</th>
-                        <th>Result</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {{range .Databases}}
-                    <tr>
-                        <td>{{.Name}}</td>
-                        <td>{{formatTime .FirstDiscovered}}</td>
-                        <td>{{formatTime .LastBackupTime}}</td>
-                        <td>{{if gt .LastBackupSize 0}}{{formatBytes .LastBackupSize}}{{else}}-{{end}}</td>
-                        <td>
-                            {{if .LastBackupResult}}
-                            <span class="badge {{.LastBackupResult}}">{{.LastBackupResult}}</span>
-                            {{else}}
-                            <span class="badge">Pending</span>
-                            {{end}}
-                        </td>
-                    </tr>
-                    {{end}}
-                </tbody>
-            </table>
-        </div>
+        <details>
+            <summary style="cursor: pointer; outline: none; color: var(--text-secondary); font-weight: 500;">Show Databases ({{len .Databases}})</summary>
+            <div class="table-responsive" style="margin-top: 1rem;">
+                <table>
+                    <thead>
+                        <tr>
+                            <th>Database</th>
+                            <th>First Discovered</th>
+                            <th>Last Backup Time</th>
+                            <th>Size</th>
+                            <th>Result</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {{range .Databases}}
+                        <tr>
+                            <td>{{.Name}}</td>
+                            <td>{{formatTime .FirstDiscovered}}</td>
+                            <td>{{formatTime .LastBackupTime}}</td>
+                            <td>{{if gt .LastBackupSize 0}}{{formatBytes .LastBackupSize}}{{else}}-{{end}}</td>
+                            <td>
+                                {{if .LastBackupResult}}
+                                <span class="badge {{.LastBackupResult}}">{{.LastBackupResult}}</span>
+                                {{else}}
+                                <span class="badge">Pending</span>
+                                {{end}}
+                            </td>
+                        </tr>
+                        {{end}}
+                    </tbody>
+                </table>
+            </div>
+        </details>
         {{else}}
         <p style="color: var(--text-secondary); font-size: 0.875rem;">No databases discovered yet.</p>
         {{end}}
@@ -395,16 +398,18 @@
 
     <div class="inventory-section">
         <h2>Backup Inventory</h2>
-        {{range $instName, $dbs := .Inventory}}
+        {{range .Inventory}}
         <details class="instance-card" style="padding: 1rem 1.5rem; cursor: pointer;">
             <summary style="font-size: 1.5rem; font-weight: 500; outline: none; list-style-position: inside;">
-                {{$instName}}
+                {{.Name}}
             </summary>
             <div style="cursor: default; margin-top: 1.5rem;">
-                {{range $dbName, $files := $dbs}}
+                {{$instName := .Name}}
+                {{range .Databases}}
+                {{$dbName := .Name}}
                 <details class="db-inventory" style="cursor: pointer;">
                     <summary style="font-size: 1.1rem; color: var(--text-secondary); margin: 0.5rem 0; outline: none; list-style-position: inside;">
-                        {{$dbName}} <span style="font-size: 0.8rem; opacity: 0.7;">({{len $files}} files)</span>
+                        {{.Name}} <span style="font-size: 0.8rem; opacity: 0.7;">({{len .Files}} files)</span>
                     </summary>
                     <div style="cursor: default; margin-top: 0.5rem;" class="table-responsive">
                         <table style="table-layout: fixed; width: 100%; min-width: 600px;">
@@ -415,7 +420,7 @@
                                 <col style="width: 23%;">
                             </colgroup>
                             <tbody>
-                                {{range $files}}
+                                {{range .Files}}
                                 <tr>
                                     <td style="word-break: break-all;">{{.Name}}</td>
                                     <td>{{formatTime .Timestamp}}</td>