feat(tui): overhaul theme palette for legibility

Replace Nord and Gruvbox with Rosé Pine and Dracula. Add Kanagawa
and Everforest. Fix legibility issues across remaining themes:

- Tokyo Night: separate Muted from Fg, distinct SelectedBg
- Catppuccin Mocha: bolder semantic colors, tighter zebra, distinct SelectedBg
- Order themes by warm→cool color temperature for smooth cycling

Dockerfile

@@ -1,5 +1,5 @@
 # --- Stage 1: Builder ---
-FROM golang:1.26.4-alpine3.23@sha256:f23e8b227fb4493eabe03bede4d5a32d04092da71962f1fb79b5f7d1e6c2a17f AS builder
+FROM golang:1.26.5-alpine3.23@sha256:622e56dbc11a8cfe87cafa2331e9a201877271cbff918af53d3be315f3da88cc AS builder
 WORKDIR /app
 COPY go.mod go.sum ./
 RUN --mount=type=cache,target=/go/pkg/mod \

go.mod

@@ -1,6 +1,6 @@
 module gitea.lerkolabs.com/lerkolabs/uptop
 
-go 1.26.4
+go 1.26.5
 
 require (
 	github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7

internal/tui/data.go

@@ -50,6 +50,21 @@ func writeCmd(op string, fn func() error) tea.Cmd {
 	}
 }
 
+func (m *Model) saveBottomPanelPref() tea.Cmd {
+	v := "logs"
+	switch m.bottomPanel {
+	case bottomNone:
+		v = "none"
+	case bottomMaint:
+		v = "maint"
+	}
+	st := m.store
+	ctx := m.ctx
+	return writeCmd("Save bottom panel preference", func() error {
+		return st.SetPreference(ctx, "bottom_panel", v)
+	})
+}
+
 func sortSitesForDisplay(allSites []models.Site, collapsed map[int]bool, sortCol int, sortAsc bool) []models.Site {
 	var groups, ungrouped []models.Site
 	children := make(map[int][]models.Site)
@@ -62,8 +77,6 @@ func sortSitesForDisplay(allSites []models.Site, collapsed map[int]bool, sortCol
 			ungrouped = append(ungrouped, s)
 		}
 	}
-	sort.Slice(groups, func(i, j int) bool { return groups[i].ID < groups[j].ID })
-
 	sortSlice := func(s []models.Site) {
 		sort.Slice(s, func(i, j int) bool { return s[i].ID < s[j].ID })
 		sort.SliceStable(s, func(i, j int) bool {
@@ -83,6 +96,7 @@ func sortSitesForDisplay(allSites []models.Site, collapsed map[int]bool, sortCol
 		})
 	}
 
+	sortSlice(groups)
 	for pid := range children {
 		c := children[pid]
 		sortSlice(c)
@@ -123,6 +137,7 @@ func (m *Model) refreshLive() {
 		ordered = filterSites(ordered, m.filterText)
 	}
 	m.sites = ordered
+	m.buildMaintSet()
 	m.refreshLogContent()
 
 	if m.selectedID != 0 {
@@ -153,6 +168,118 @@ func (m *Model) clampCursor() {
 	}
 }
 
+func (m *Model) detailCmdIfNeeded() tea.Cmd {
+	if m.focusedPanel == panelMonitors && m.detailOpen && m.cursor < len(m.sites) {
+		m.detailMode = detailDefault
+		m.detailScrollOffset = 0
+		return m.loadDetailCmd(m.sites[m.cursor].ID)
+	}
+	return nil
+}
+
+func (m *Model) jumpToTop() {
+	switch m.focusedPanel {
+	case panelDetail:
+		m.detailScrollOffset = 0
+	case panelMaint:
+		m.maintCursor = 0
+	case panelLogs:
+		m.logScrollOffset = 0
+	default:
+		m.cursor = 0
+		m.tableOffset = 0
+		m.syncSelectedID()
+	}
+}
+
+func (m *Model) jumpToBottom() {
+	switch m.focusedPanel {
+	case panelDetail:
+		m.detailScrollOffset = 9999
+	case panelMaint:
+		windows := m.activeMaintWindows()
+		if len(windows) > 0 {
+			m.maintCursor = len(windows) - 1
+		}
+	case panelLogs:
+		total := m.filteredLogCount()
+		if total > 0 {
+			m.logScrollOffset = total - 1
+		}
+	default:
+		max := m.currentListLen() - 1
+		if max >= 0 {
+			m.cursor = max
+			if m.cursor >= m.tableOffset+m.maxTableRows {
+				m.tableOffset = m.cursor - m.maxTableRows + 1
+			}
+			m.syncSelectedID()
+		}
+	}
+}
+
+func (m *Model) halfPageUp() {
+	half := m.maxTableRows / 2
+	if half < 1 {
+		half = 1
+	}
+	switch m.focusedPanel {
+	case panelDetail:
+		m.detailScrollOffset -= half
+		if m.detailScrollOffset < 0 {
+			m.detailScrollOffset = 0
+		}
+	case panelMaint:
+		m.maintCursor -= half
+		if m.maintCursor < 0 {
+			m.maintCursor = 0
+		}
+	case panelLogs:
+		m.scrollLogs(-half)
+	default:
+		m.cursor -= half
+		if m.cursor < 0 {
+			m.cursor = 0
+		}
+		if m.cursor < m.tableOffset {
+			m.tableOffset = m.cursor
+		}
+		m.syncSelectedID()
+	}
+}
+
+func (m *Model) halfPageDown() {
+	half := m.maxTableRows / 2
+	if half < 1 {
+		half = 1
+	}
+	switch m.focusedPanel {
+	case panelDetail:
+		m.detailScrollOffset += half
+	case panelMaint:
+		windows := m.activeMaintWindows()
+		m.maintCursor += half
+		if len(windows) > 0 && m.maintCursor >= len(windows) {
+			m.maintCursor = len(windows) - 1
+		}
+	case panelLogs:
+		m.scrollLogs(half)
+	default:
+		max := m.currentListLen() - 1
+		m.cursor += half
+		if m.cursor > max {
+			m.cursor = max
+		}
+		if m.cursor < 0 {
+			m.cursor = 0
+		}
+		if m.cursor >= m.tableOffset+m.maxTableRows {
+			m.tableOffset = m.cursor - m.maxTableRows + 1
+		}
+		m.syncSelectedID()
+	}
+}
+
 // loadTabDataCmd returns a tea.Cmd that loads the DB-backed tab tables off the
 // UI goroutine. Each call bumps tabSeq and stamps the reply with it, so
 // handleTabData can drop out-of-order results from slower earlier loads. The

internal/tui/format.go

@@ -104,6 +104,13 @@ func (m Model) fmtLatency(d time.Duration) string {
 	return m.st.dangerStyle.Render(s)
 }
 
+func (m Model) fmtUptimeMaint(statuses []bool, siteID int) string {
+	if m.isMonitorInMaintenance(siteID) {
+		return m.st.subtleStyle.Render("—")
+	}
+	return m.fmtUptime(statuses)
+}
+
 func (m Model) fmtUptime(statuses []bool) string {
 	if len(statuses) == 0 {
 		return m.st.subtleStyle.Render("—")
@@ -155,6 +162,27 @@ func (m Model) fmtRetries(site models.Site) string {
 	return s
 }
 
+func (m Model) fmtStatusDot(status models.Status, paused bool, inMaint bool) string {
+	if paused {
+		return m.st.warnStyle.Render("◇")
+	}
+	if inMaint {
+		return m.st.maintStyle.Render("◼")
+	}
+	switch status {
+	case models.StatusDown, models.StatusSSLExp:
+		return m.st.dangerStyle.Render("▼")
+	case models.StatusLate:
+		return m.st.warnStyle.Render("◆")
+	case models.StatusStale:
+		return m.st.staleStyle.Render("◆")
+	case models.StatusPending:
+		return m.st.subtleStyle.Render("○")
+	default:
+		return m.st.specialStyle.Render("▲")
+	}
+}
+
 func (m Model) fmtStatus(status models.Status, paused bool, inMaint bool) string {
 	if paused {
 		return m.st.warnStyle.Render("◇ PAUSED")

internal/tui/histogram.go

@@ -0,0 +1,89 @@
+package tui
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/lipgloss"
+)
+
+type latencyBucket struct {
+	label string
+	min   int64
+	max   int64
+	count int
+}
+
+func (m Model) latencyHistogram(latencies []time.Duration, statuses []bool, width int) string {
+	if len(latencies) == 0 || width < 30 {
+		return ""
+	}
+
+	buckets := []latencyBucket{
+		{"0-50ms", 0, 50, 0},
+		{"50-100ms", 50, 100, 0},
+		{"100-200ms", 100, 200, 0},
+		{"200-500ms", 200, 500, 0},
+		{"500ms+", 500, 999999, 0},
+	}
+
+	for i, l := range latencies {
+		if i < len(statuses) && !statuses[i] {
+			continue
+		}
+		ms := l.Milliseconds()
+		for j := range buckets {
+			if ms >= buckets[j].min && ms < buckets[j].max {
+				buckets[j].count++
+				break
+			}
+		}
+	}
+
+	maxCount := 0
+	for _, b := range buckets {
+		if b.count > maxCount {
+			maxCount = b.count
+		}
+	}
+	if maxCount == 0 {
+		return ""
+	}
+
+	labelW := 10
+	countW := len(fmt.Sprintf("%d", maxCount))
+	barW := width - labelW - countW - 4
+	if barW < 5 {
+		barW = 5
+	}
+
+	var sb strings.Builder
+	for _, b := range buckets {
+		fill := 0
+		if maxCount > 0 {
+			fill = b.count * barW / maxCount
+		}
+
+		var barColor lipgloss.Style
+		switch {
+		case b.min < 100:
+			barColor = m.st.specialStyle
+		case b.min < 500:
+			barColor = m.st.warnStyle
+		default:
+			barColor = m.st.dangerStyle
+		}
+
+		bar := barColor.Render(strings.Repeat("█", fill))
+		if fill < barW {
+			bar += m.st.subtleStyle.Render(strings.Repeat("░", barW-fill))
+		}
+
+		label := fmt.Sprintf("%*s", labelW, b.label)
+		count := fmt.Sprintf("%*d", countW, b.count)
+		sb.WriteString("  " + m.st.subtleStyle.Render(label) + " " + bar + " " + count + "\n")
+	}
+
+	return sb.String()
+}

internal/tui/panel.go

@@ -6,7 +6,13 @@ import (
 	"github.com/charmbracelet/lipgloss"
 )
 
-func (m Model) titledPanelH(title, content, footer string, width, height, scrollOffset int, focused bool) string {
+type scrollbar struct {
+	pos     int
+	total   int
+	visible int
+}
+
+func (m Model) titledPanelH(title, content, footer string, width, height, scrollOffset int, sb scrollbar, focused bool) string {
 	if height <= 0 {
 		return m.titledPanel(title, content, width, focused)
 	}
@@ -64,21 +70,61 @@ func (m Model) titledPanelH(title, content, footer string, width, height, scroll
 	}
 	visible := contentLines[scrollOffset:end]
 
-	borderLine := func(line string) string {
-		return bc.Render("│") + line + strings.Repeat(" ", max(0, innerW-lipgloss.Width(line))) + bc.Render("│")
+	if sb.total == 0 && len(contentLines) > bodyH {
+		sb = scrollbar{pos: scrollOffset, total: len(contentLines), visible: bodyH}
+	}
+	sbVisible := sb.visible
+	if sbVisible <= 0 {
+		sbVisible = bodyH
+	}
+	showScrollbar := sb.total > 0 && sb.total > sbVisible
+	var thumbStart, thumbEnd int
+	if showScrollbar {
+		thumbSize := bodyH * sbVisible / sb.total
+		if thumbSize < 1 {
+			thumbSize = 1
+		}
+		scrollRange := sb.total - sbVisible
+		if scrollRange < 1 {
+			scrollRange = 1
+		}
+		trackSpace := bodyH - thumbSize
+		thumbStart = sb.pos * trackSpace / scrollRange
+		if thumbStart < 0 {
+			thumbStart = 0
+		}
+		thumbEnd = thumbStart + thumbSize
+		if thumbEnd > bodyH {
+			thumbEnd = bodyH
+		}
+	}
+
+	scrollTrack := lipgloss.NewStyle().Foreground(m.theme.Border).Render("░")
+	scrollThumb := lipgloss.NewStyle().Foreground(m.theme.Accent).Render("█")
+
+	borderLine := func(line string, idx int) string {
+		rightBorder := bc.Render("│")
+		if showScrollbar && idx >= thumbStart && idx < thumbEnd {
+			rightBorder = scrollThumb
+		} else if showScrollbar {
+			rightBorder = scrollTrack
+		}
+		return bc.Render("│") + line + strings.Repeat(" ", max(0, innerW-lipgloss.Width(line))) + rightBorder
+	}
+	emptyLine := func(idx int) string {
+		return borderLine(strings.Repeat(" ", innerW), idx)
 	}
-	emptyLine := borderLine(strings.Repeat(" ", innerW))
 
 	var lines []string
 	lines = append(lines, top)
-	for _, line := range visible {
-		lines = append(lines, borderLine(line))
+	for i, line := range visible {
+		lines = append(lines, borderLine(line, i))
 	}
-	for len(lines) < height-1-len(footerLines) {
-		lines = append(lines, emptyLine)
+	for i := len(visible); len(lines) < height-1-len(footerLines); i++ {
+		lines = append(lines, emptyLine(i))
 	}
 	for _, line := range footerLines {
-		lines = append(lines, borderLine(line))
+		lines = append(lines, borderLine(line, -1))
 	}
 	lines = append(lines, bottom)
 

internal/tui/sparkline.go

@@ -156,9 +156,8 @@ func resolveSparklineIndex(x, sparkWidth, dataLen int) int {
 }
 
 func (m Model) groupSparkline(groupID int, width int, bg lipgloss.TerminalColor) string {
-	allSites := m.engine.GetAllSites()
 	var childStatuses [][]bool
-	for _, s := range allSites {
+	for _, s := range m.sites {
 		if s.ParentID == groupID && !s.Paused && !m.isMonitorInMaintenance(s.ID) {
 			hist, _ := m.engine.GetHistory(s.ID)
 			if len(hist.Statuses) > 0 {
@@ -209,9 +208,8 @@ func (m Model) groupSparkline(groupID int, width int, bg lipgloss.TerminalColor)
 }
 
 func (m Model) groupUptime(groupID int) string {
-	allSites := m.engine.GetAllSites()
 	var allStatuses [][]bool
-	for _, s := range allSites {
+	for _, s := range m.sites {
 		if s.ParentID == groupID && !s.Paused && !m.isMonitorInMaintenance(s.ID) {
 			hist, _ := m.engine.GetHistory(s.ID)
 			if len(hist.Statuses) > 0 {

internal/tui/tab_logs_sidebar.go

@@ -72,6 +72,20 @@ func (m Model) viewLogsStrip(width, maxLines int) string {
 	return style.Render(strings.Join(visible, "\n"))
 }
 
+func (m Model) filteredLogCount() int {
+	count := 0
+	for _, entry := range m.engine.GetLogs() {
+		if strings.TrimSpace(entry.Message) == "" {
+			continue
+		}
+		if m.logFilterImportant && !isImportantLog(classifyLog(entry.Message)) {
+			continue
+		}
+		count++
+	}
+	return count
+}
+
 func (m *Model) scrollLogs(delta int) {
 	logs := m.engine.GetLogs()
 	total := 0

internal/tui/tab_maint.go

@@ -21,27 +21,36 @@ type maintFormData struct {
 }
 
 func (m Model) isMonitorInMaintenance(monitorID int) bool {
+	return m.maintSet[monitorID]
+}
+
+func (m *Model) buildMaintSet() {
+	set := make(map[int]bool)
+	now := time.Now()
 	for _, mw := range m.maintenanceWindows {
 		if mw.Type != "maintenance" {
 			continue
 		}
-		now := time.Now()
 		if mw.StartTime.After(now) {
 			continue
 		}
 		if !mw.EndTime.IsZero() && mw.EndTime.Before(now) {
 			continue
 		}
-		if mw.MonitorID == 0 || mw.MonitorID == monitorID {
-			return true
+		if mw.MonitorID == 0 {
+			for _, s := range m.sites {
+				set[s.ID] = true
+			}
+			break
 		}
+		set[mw.MonitorID] = true
 		for _, s := range m.sites {
-			if s.ID == monitorID && s.ParentID > 0 && mw.MonitorID == s.ParentID {
-				return true
+			if s.ParentID == mw.MonitorID {
+				set[s.ID] = true
 			}
 		}
 	}
-	return false
+	m.maintSet = set
 }
 
 func (m *Model) initMaintHuhForm() tea.Cmd {

internal/tui/tab_sites.go

@@ -34,10 +34,9 @@ type siteFormData struct {
 type colKey int
 
 const (
-	colNum colKey = iota
+	colDot colKey = iota
 	colName
 	colType
-	colStatus
 	colLatency
 	colUptime
 	colHistory
@@ -55,17 +54,18 @@ type columnDef struct {
 }
 
 var siteColumns = []columnDef{
-	{colNum, "#", "#", 4, 4, 0},
+	{colDot, "", "", 3, 3, 0},
 	{colName, "NAME", "NAME", 0, 0, 0},
-	{colType, "TYPE", "TYPE", 10, 8, mediumBreakpoint},
-	{colStatus, "STATUS", "STATUS", 10, 10, 0},
+	{colType, "TYPE", "TYPE", 10, 8, 0},
 	{colLatency, "LATENCY", "LAT", 10, 7, 0},
-	{colUptime, "UPTIME", "UP%", 8, 8, mediumBreakpoint},
-	{colHistory, "HISTORY", "HISTORY", 0, 0, mediumBreakpoint},
-	{colSSL, "SSL", "SSL", 7, 5, wideBreakpoint},
-	{colRetries, "RETRIES", "RT", 9, 5, wideBreakpoint},
+	{colUptime, "UPTIME", "UP%", 8, 8, 0},
+	{colHistory, "HISTORY", "HISTORY", 0, 0, 0},
+	{colSSL, "SSL", "SSL", 7, 5, 0},
+	{colRetries, "RETRIES", "RT", 9, 5, 0},
 }
 
+var columnDropOrder = []colKey{colHistory, colRetries, colSSL, colUptime, colType}
+
 type tableLayout struct {
 	nameW, sparkW int
 	headers       []string
@@ -76,17 +76,51 @@ type tableLayout struct {
 func (m Model) computeLayout() tableLayout {
 	wide := m.isWide()
 
-	var active []colKey
-	var headers []string
-	var widths []int
-	var fixed int
-
 	cw := m.contentWidth
 	if cw == 0 {
 		cw = m.termWidth
 	}
+
+	dropped := make(map[colKey]bool)
+	minNameW := 20
+	minSparkW := 12
+
+	for attempt := 0; attempt <= len(columnDropOrder); attempt++ {
+		var fixed int
+		var flexCount int
+		for _, c := range siteColumns {
+			if dropped[c.key] {
+				continue
+			}
+			w := c.narrowW
+			if wide {
+				w = c.wideW
+			}
+			if w > 0 {
+				fixed += w
+			} else {
+				flexCount++
+			}
+		}
+		numCols := len(siteColumns) - len(dropped)
+		borderOverhead := 2 + (numCols - 1)
+		avail := cw - chromePadH - 2 - borderOverhead - fixed
+		minFlex := minNameW
+		if flexCount > 1 {
+			minFlex += minSparkW
+		}
+		if avail >= minFlex || attempt >= len(columnDropOrder) {
+			break
+		}
+		dropped[columnDropOrder[attempt]] = true
+	}
+
+	var active []colKey
+	var headers []string
+	var widths []int
+	var fixed int
 	for _, c := range siteColumns {
-		if c.minTerm > 0 && cw < c.minTerm {
+		if dropped[c.key] {
 			continue
 		}
 		active = append(active, c.key)
@@ -106,12 +140,12 @@ func (m Model) computeLayout() tableLayout {
 	}
 
 	sortColMap := map[int]colKey{
-		sortStatus:  colStatus,
+		sortStatus:  colDot,
 		sortName:    colName,
 		sortLatency: colLatency,
 	}
 	sortableKeys := map[colKey]string{
-		colStatus:  "sort-status",
+		colDot:     "sort-status",
 		colName:    "sort-name",
 		colLatency: "sort-latency",
 	}
@@ -245,11 +279,11 @@ func (m Model) viewSitesTab() string {
 				if site.Type == "group" {
 					groupRows[i-start] = true
 					icon := typeIcon("group", m.collapsed[site.ID])
+					inMaint := m.isMonitorInMaintenance(site.ID)
 					cells := map[colKey]string{
-						colNum:     strconv.Itoa(i + 1),
+						colDot:     m.fmtStatusDot(site.Status, site.Paused, inMaint),
 						colName:    m.zones.Mark(fmt.Sprintf("site-%d", i), icon+" "+limitStr(site.Name, nameW-4)),
 						colType:    "group",
-						colStatus:  m.fmtStatus(site.Status, site.Paused, m.isMonitorInMaintenance(site.ID)),
 						colLatency: m.st.subtleStyle.Render("—"),
 						colUptime:  m.groupUptime(site.ID),
 						colHistory: m.groupSparkline(site.ID, sparkWidth, rowBg),
@@ -293,13 +327,13 @@ func (m Model) viewSitesTab() string {
 					spark = m.latencySparkline(hist.Latencies, hist.Statuses, sparkWidth, rowBg)
 				}
 
+				inMaint := m.isMonitorInMaintenance(site.ID)
 				cells := map[colKey]string{
-					colNum:     strconv.Itoa(i + 1),
+					colDot:     m.fmtStatusDot(site.Status, site.Paused, inMaint),
 					colName:    m.zones.Mark(fmt.Sprintf("site-%d", i), name),
 					colType:    typeIcon(site.Type, false) + " " + site.Type,
-					colStatus:  m.fmtStatus(site.Status, site.Paused, m.isMonitorInMaintenance(site.ID)),
 					colLatency: m.fmtLatency(site.Latency),
-					colUptime:  m.fmtUptime(hist.Statuses),
+					colUptime:  m.fmtUptimeMaint(hist.Statuses, site.ID),
 					colHistory: spark,
 					colSSL:     m.fmtSSL(site),
 					colRetries: m.fmtRetries(site),

internal/tui/theme.go

@@ -46,10 +46,12 @@ type Theme struct {
 
 var themes = []Theme{
 	themeFlexokiDark,
+	themeEverforest,
+	themeKanagawa,
 	themeTokyoNight,
 	themeCatppuccinMocha,
-	themeNord,
-	themeGruvbox,
+	themeRosePine,
+	themeDracula,
 }
 
 var themeFlexokiDark = Theme{
@@ -80,7 +82,7 @@ var themeTokyoNight = Theme{
 	Panel:      cc("#292e42", ""),
 	Border:     cc("#3b4261", "8"),
 	Fg:         cc("#c0caf5", "15"),
-	Muted:      cc("#a9b1d6", "7"),
+	Muted:      cc("#7982a9", "7"),
 	Subtle:     cc("#565f89", "7"),
 	Success:    cc("#9ece6a", "10"),
 	Warning:    cc("#e0af68", "11"),
@@ -91,28 +93,28 @@ var themeTokyoNight = Theme{
 	Purple:     cc("#bb9af7", "13"),
 	ZebraBg:    cc("#1c1d28", ""),
 	SelectedFg: cc("#c0caf5", "15"),
-	SelectedBg: cc("#292e42", "4"),
+	SelectedBg: cc("#363c53", "4"),
 }
 
-var themeGruvbox = Theme{
-	Name:       "Gruvbox",
-	Bg:         cc("#282828", ""),
-	Surface:    cc("#3c3836", ""),
-	Panel:      cc("#504945", ""),
-	Border:     cc("#665c54", "8"),
-	Fg:         cc("#ebdbb2", "15"),
-	Muted:      cc("#bdae93", "7"),
-	Subtle:     cc("#7c6f64", "7"),
-	Success:    cc("#b8bb26", "10"),
-	Warning:    cc("#fabd2f", "11"),
-	Stale:      cc("#fe8019", "3"),
-	Danger:     cc("#fb4934", "9"),
-	Info:       cc("#83a598", "12"),
-	Accent:     cc("#8ec07c", "14"),
-	Purple:     cc("#d3869b", "13"),
-	ZebraBg:    cc("#2a2a2a", ""),
-	SelectedFg: cc("#fbf1c7", "15"),
-	SelectedBg: cc("#504945", "4"),
+var themeDracula = Theme{
+	Name:       "Dracula",
+	Bg:         cc("#282a36", ""),
+	Surface:    cc("#343746", ""),
+	Panel:      cc("#44475a", ""),
+	Border:     cc("#6272a4", "8"),
+	Fg:         cc("#f8f8f2", "15"),
+	Muted:      cc("#a9b0cb", "7"),
+	Subtle:     cc("#6272a4", "7"),
+	Success:    cc("#50fa7b", "10"),
+	Warning:    cc("#f1fa8c", "11"),
+	Stale:      cc("#ffb86c", "3"),
+	Danger:     cc("#ff5555", "9"),
+	Info:       cc("#8be9fd", "12"),
+	Accent:     cc("#bd93f9", "14"),
+	Purple:     cc("#ff79c6", "13"),
+	ZebraBg:    cc("#2c2e3a", ""),
+	SelectedFg: cc("#f8f8f2", "15"),
+	SelectedBg: cc("#52556b", "4"),
 }
 
 var themeCatppuccinMocha = Theme{
@@ -124,37 +126,79 @@ var themeCatppuccinMocha = Theme{
 	Fg:         cc("#cdd6f4", "15"),
 	Muted:      cc("#a6adc8", "7"),
 	Subtle:     cc("#6c7086", "7"),
-	Success:    cc("#a6e3a1", "10"),
-	Warning:    cc("#f9e2af", "11"),
+	Success:    cc("#7dc47a", "10"),
+	Warning:    cc("#f0c644", "11"),
 	Stale:      cc("#fab387", "3"),
-	Danger:     cc("#f38ba8", "9"),
+	Danger:     cc("#e6546e", "9"),
 	Info:       cc("#89b4fa", "12"),
 	Accent:     cc("#94e2d5", "14"),
 	Purple:     cc("#cba6f7", "13"),
-	ZebraBg:    cc("#232334", ""),
+	ZebraBg:    cc("#212130", ""),
 	SelectedFg: cc("#cdd6f4", "15"),
-	SelectedBg: cc("#45475a", "4"),
+	SelectedBg: cc("#585b70", "4"),
 }
 
-var themeNord = Theme{
-	Name:       "Nord",
-	Bg:         cc("#2e3440", ""),
-	Surface:    cc("#3b4252", ""),
-	Panel:      cc("#434c5e", ""),
-	Border:     cc("#4c566a", "8"),
-	Fg:         cc("#d8dee9", "15"),
-	Muted:      cc("#d8dee9", "7"),
-	Subtle:     cc("#4c566a", "7"),
-	Success:    cc("#a3be8c", "10"),
-	Warning:    cc("#ebcb8b", "11"),
-	Stale:      cc("#d08770", "3"),
-	Danger:     cc("#bf616a", "9"),
-	Info:       cc("#81a1c1", "12"),
-	Accent:     cc("#88c0d0", "14"),
-	Purple:     cc("#b48ead", "13"),
-	ZebraBg:    cc("#323845", ""),
-	SelectedFg: cc("#eceff4", "15"),
-	SelectedBg: cc("#434c5e", "4"),
+var themeRosePine = Theme{
+	Name:       "Rosé Pine",
+	Bg:         cc("#191724", ""),
+	Surface:    cc("#1f1d2e", ""),
+	Panel:      cc("#26233a", ""),
+	Border:     cc("#524f67", "8"),
+	Fg:         cc("#e0def4", "15"),
+	Muted:      cc("#908caa", "7"),
+	Subtle:     cc("#6e6a86", "7"),
+	Success:    cc("#9ccfd8", "10"),
+	Warning:    cc("#f6c177", "11"),
+	Stale:      cc("#ebbcba", "3"),
+	Danger:     cc("#eb6f92", "9"),
+	Info:       cc("#3e8fb0", "12"),
+	Accent:     cc("#c4a7e7", "14"),
+	Purple:     cc("#ebbcba", "13"),
+	ZebraBg:    cc("#1c1a28", ""),
+	SelectedFg: cc("#e0def4", "15"),
+	SelectedBg: cc("#403d52", "4"),
+}
+
+var themeKanagawa = Theme{
+	Name:       "Kanagawa",
+	Bg:         cc("#1F1F28", ""),
+	Surface:    cc("#2A2A37", ""),
+	Panel:      cc("#363646", ""),
+	Border:     cc("#54546D", "8"),
+	Fg:         cc("#DCD7BA", "15"),
+	Muted:      cc("#C8C093", "7"),
+	Subtle:     cc("#727169", "7"),
+	Success:    cc("#98BB6C", "10"),
+	Warning:    cc("#E6C384", "11"),
+	Stale:      cc("#FFA066", "3"),
+	Danger:     cc("#E46876", "9"),
+	Info:       cc("#7E9CD8", "12"),
+	Accent:     cc("#7FB4CA", "14"),
+	Purple:     cc("#D27E99", "13"),
+	ZebraBg:    cc("#22222c", ""),
+	SelectedFg: cc("#DCD7BA", "15"),
+	SelectedBg: cc("#2D4F67", "4"),
+}
+
+var themeEverforest = Theme{
+	Name:       "Everforest",
+	Bg:         cc("#2F383E", ""),
+	Surface:    cc("#343F44", ""),
+	Panel:      cc("#3D484D", ""),
+	Border:     cc("#56635F", "8"),
+	Fg:         cc("#D3C6AA", "15"),
+	Muted:      cc("#9DA9A0", "7"),
+	Subtle:     cc("#7A8478", "7"),
+	Success:    cc("#A7C080", "10"),
+	Warning:    cc("#DBBC7F", "11"),
+	Stale:      cc("#E69875", "3"),
+	Danger:     cc("#E67E80", "9"),
+	Info:       cc("#7FBBB3", "12"),
+	Accent:     cc("#83C092", "14"),
+	Purple:     cc("#D699B6", "13"),
+	ZebraBg:    cc("#30393F", ""),
+	SelectedFg: cc("#D3C6AA", "15"),
+	SelectedBg: cc("#475258", "4"),
 }
 
 func (t Theme) HuhTheme() *huh.Theme {

internal/tui/tui.go

@@ -95,6 +95,14 @@ const (
 	panelMaint    = 3
 )
 
+type bottomPanel int
+
+const (
+	bottomNone bottomPanel = iota
+	bottomLogs
+	bottomMaint
+)
+
 const (
 	detailDefault = 0
 	detailSLA     = 1
@@ -111,16 +119,17 @@ const (
 type sessionState int
 
 const (
-	stateDashboard     sessionState = 0
-	stateLogs          sessionState = 1
-	stateAlertDetail   sessionState = 3
-	stateFormSite      sessionState = 4
-	stateFormAlert     sessionState = 5
-	stateFormUser      sessionState = 6
-	stateConfirmDelete sessionState = 7
-	stateFormMaint     sessionState = 8
-	stateSettings      sessionState = 11
-	stateMaintDetail   sessionState = 12
+	stateDashboard        sessionState = 0
+	stateLogs             sessionState = 1
+	stateDetailFullscreen sessionState = 2
+	stateAlertDetail      sessionState = 3
+	stateFormSite         sessionState = 4
+	stateFormAlert        sessionState = 5
+	stateFormUser         sessionState = 6
+	stateConfirmDelete    sessionState = 7
+	stateFormMaint        sessionState = 8
+	stateSettings         sessionState = 11
+	stateMaintDetail      sessionState = 12
 )
 
 type Model struct {
@@ -198,11 +207,10 @@ type Model struct {
 	lastTabLoad        time.Time // last dispatch of loadTabDataCmd (throttle)
 	tabSeq             int       // seq of the newest issued tab-data load
 
-	logsOpen            bool
+	maintSet            map[int]bool
+	bottomPanel         bottomPanel
 	detailOpen          bool
-	maintOpen           bool
 	maintCursor         int
-	maintOffset         int
 	detailChanges       []models.StateChange
 	detailChangesSiteID int
 	detailDailyDays     []monitor.DayReport
@@ -210,6 +218,8 @@ type Model struct {
 	filterMode bool
 	filterText string
 
+	pendingG bool
+
 	// demoMode renders a stable status dot instead of the animated pulse so
 	// screenshots/recordings don't capture the spinner mid-frame. Set via UPTOP_DEMO=1.
 	demoMode bool
@@ -235,6 +245,16 @@ func InitialModel(ctx context.Context, isAdmin bool, s store.Store, eng *monitor
 
 	detailPref, _ := s.GetPreference(ctx, "detail_open")
 
+	bp := bottomLogs
+	if bpPref, _ := s.GetPreference(ctx, "bottom_panel"); bpPref != "" {
+		switch bpPref {
+		case "none":
+			bp = bottomNone
+		case "maint":
+			bp = bottomMaint
+		}
+	}
+
 	return Model{
 		ctx:          ctx,
 		state:        stateDashboard,
@@ -249,7 +269,7 @@ func InitialModel(ctx context.Context, isAdmin bool, s store.Store, eng *monitor
 		theme:        theme,
 		themeIndex:   themeIdx,
 		st:           newStyles(theme),
-		logsOpen:     true,
+		bottomPanel:  bp,
 		detailOpen:   detailPref == "true",
 		demoMode:     os.Getenv("UPTOP_DEMO") == "1",
 		version:      version,

internal/tui/update.go

@@ -19,7 +19,8 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tabDataMsg:
 		return m.handleTabData(msg)
 	case detailDataMsg:
-		if m.detailOpen && m.cursor < len(m.sites) && m.sites[m.cursor].ID != msg.siteID {
+		detailVisible := m.detailOpen || m.state == stateDetailFullscreen
+		if detailVisible && m.cursor < len(m.sites) && m.sites[m.cursor].ID != msg.siteID {
 			return m, nil
 		}
 		m.detailChanges = msg.changes
@@ -51,6 +52,9 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	if m.state == stateLogs {
 		return m.handleLogsFullscreen(msg)
 	}
+	if m.state == stateDetailFullscreen {
+		return m.handleDetailFullscreen(msg)
+	}
 
 	switch msg := msg.(type) {
 	case tea.MouseMsg:
@@ -157,7 +161,7 @@ func (m *Model) recalcLayout() {
 	if m.filterMode || m.filterText != "" {
 		chrome++
 	}
-	if m.logsOpen {
+	if m.bottomPanel != bottomNone {
 		chrome += logsStripHeight
 	}
 	m.maxTableRows = m.termHeight - chrome
@@ -203,7 +207,7 @@ func (m *Model) handleTick(t time.Time) (tea.Model, tea.Cmd) {
 // tab-data cadence, so a flap that happens while the panel is on screen shows
 // up without leaving and re-entering. Nil when no detail panel is open.
 func (m *Model) detailRefreshCmd() tea.Cmd {
-	if !m.detailOpen || m.cursor >= len(m.sites) {
+	if (!m.detailOpen && m.state != stateDetailFullscreen) || m.cursor >= len(m.sites) {
 		return nil
 	}
 	return m.loadDetailCmd(m.sites[m.cursor].ID)
@@ -227,6 +231,7 @@ func (m *Model) handleTabData(msg tabDataMsg) (tea.Model, tea.Cmd) {
 	}
 	m.nodes = msg.nodes
 	m.maintenanceWindows = msg.maint
+	m.buildMaintSet()
 	m.clampCursor()
 	return m, nil
 }
@@ -247,6 +252,17 @@ func (m *Model) testAlertCmd(id int, name string) tea.Cmd {
 func (m *Model) handleLogsFullscreen(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
+		if msg.String() == "g" {
+			if m.pendingG {
+				m.pendingG = false
+				m.logViewport.GotoTop()
+				return m, nil
+			}
+			m.pendingG = true
+			return m, nil
+		}
+		m.pendingG = false
+
 		switch msg.String() {
 		case "esc", "q":
 			m.state = stateDashboard
@@ -256,6 +272,12 @@ func (m *Model) handleLogsFullscreen(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "f":
 			m.logFilterImportant = !m.logFilterImportant
 			m.refreshLogContent()
+		case "G":
+			m.logViewport.GotoBottom()
+		case "ctrl+u":
+			m.logViewport.ScrollUp(m.logViewport.Height / 2)
+		case "ctrl+d":
+			m.logViewport.ScrollDown(m.logViewport.Height / 2)
 		case "up", "k":
 			m.logViewport.ScrollUp(1)
 		case "down", "j":
@@ -278,6 +300,95 @@ func (m *Model) handleLogsFullscreen(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, nil
 }
 
+func (m *Model) handleDetailFullscreen(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		if msg.String() == "g" {
+			if m.pendingG {
+				m.pendingG = false
+				m.detailScrollOffset = 0
+				return m, nil
+			}
+			m.pendingG = true
+			return m, nil
+		}
+		m.pendingG = false
+
+		switch msg.String() {
+		case "esc", "q":
+			m.state = stateDashboard
+			m.focusedPanel = panelMonitors
+		case "ctrl+c":
+			return m, tea.Quit
+		case "e":
+			return m.handleEditItem()
+		case "h":
+			if m.cursor < len(m.sites) {
+				site := m.sites[m.cursor]
+				m.historySiteName = site.Name
+				m.historySiteID = site.ID
+				m.historyChanges = nil
+				m.detailMode = detailHistory
+				m.detailScrollOffset = 0
+				return m, m.loadHistoryCmd(site.ID)
+			}
+		case "s":
+			if m.cursor < len(m.sites) {
+				site := m.sites[m.cursor]
+				m.slaSiteName = site.Name
+				m.slaSiteID = site.ID
+				m.slaPeriodIdx = 2
+				m.detailMode = detailSLA
+				m.detailScrollOffset = 0
+				return m, m.loadSLACmd(site.ID, m.slaPeriodIdx)
+			}
+		case "1", "2", "3", "4":
+			if m.detailMode == detailSLA {
+				idx := int(msg.String()[0]-'0') - 1
+				if idx >= 0 && idx < len(slaPeriods) {
+					m.slaPeriodIdx = idx
+					m.detailScrollOffset = 0
+					return m, m.loadSLACmd(m.slaSiteID, idx)
+				}
+			}
+		case "G":
+			m.detailScrollOffset = 9999
+		case "ctrl+u":
+			m.detailScrollOffset -= 5
+			if m.detailScrollOffset < 0 {
+				m.detailScrollOffset = 0
+			}
+		case "ctrl+d":
+			m.detailScrollOffset += 5
+		case "up", "k":
+			m.detailScrollOffset--
+			if m.detailScrollOffset < 0 {
+				m.detailScrollOffset = 0
+			}
+		case "down", "j":
+			m.detailScrollOffset++
+		case "pgup":
+			m.detailScrollOffset -= 10
+			if m.detailScrollOffset < 0 {
+				m.detailScrollOffset = 0
+			}
+		case "pgdown":
+			m.detailScrollOffset += 10
+		}
+	case tea.MouseMsg:
+		switch msg.Button {
+		case tea.MouseButtonWheelUp:
+			m.detailScrollOffset -= 3
+			if m.detailScrollOffset < 0 {
+				m.detailScrollOffset = 0
+			}
+		case tea.MouseButtonWheelDown:
+			m.detailScrollOffset += 3
+		}
+	}
+	return m, nil
+}
+
 func (m *Model) handleMouse(msg tea.MouseMsg) (tea.Model, tea.Cmd) {
 	if m.state != stateDashboard {
 		return m, nil
@@ -470,7 +581,52 @@ func (m *Model) handleAlertDetailKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 }
 
 func (m *Model) handleSettingsKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+	if msg.String() == "g" {
+		if m.pendingG {
+			m.pendingG = false
+			m.settingsCursor = 0
+			m.settingsOffset = 0
+			return m, nil
+		}
+		m.pendingG = true
+		return m, nil
+	}
+	m.pendingG = false
+
 	switch msg.String() {
+	case "G":
+		max := m.settingsListLen() - 1
+		if max >= 0 {
+			m.settingsCursor = max
+			if m.settingsCursor >= m.settingsOffset+m.maxTableRows {
+				m.settingsOffset = m.settingsCursor - m.maxTableRows + 1
+			}
+		}
+	case "ctrl+u":
+		half := m.maxTableRows / 2
+		if half < 1 {
+			half = 1
+		}
+		m.settingsCursor -= half
+		if m.settingsCursor < 0 {
+			m.settingsCursor = 0
+		}
+		if m.settingsCursor < m.settingsOffset {
+			m.settingsOffset = m.settingsCursor
+		}
+	case "ctrl+d":
+		half := m.maxTableRows / 2
+		if half < 1 {
+			half = 1
+		}
+		max := m.settingsListLen() - 1
+		m.settingsCursor += half
+		if m.settingsCursor > max {
+			m.settingsCursor = max
+		}
+		if m.settingsCursor >= m.settingsOffset+m.maxTableRows {
+			m.settingsOffset = m.settingsCursor - m.maxTableRows + 1
+		}
 	case "esc", "S":
 		m.state = stateDashboard
 	case "ctrl+c":
@@ -561,7 +717,27 @@ func (m *Model) handleSettingsKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 }
 
 func (m *Model) handleDashboardKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+	if msg.String() == "g" {
+		if m.pendingG {
+			m.pendingG = false
+			m.jumpToTop()
+			return m, m.detailCmdIfNeeded()
+		}
+		m.pendingG = true
+		return m, nil
+	}
+	m.pendingG = false
+
 	switch msg.String() {
+	case "G":
+		m.jumpToBottom()
+		return m, m.detailCmdIfNeeded()
+	case "ctrl+u":
+		m.halfPageUp()
+		return m, m.detailCmdIfNeeded()
+	case "ctrl+d":
+		m.halfPageDown()
+		return m, m.detailCmdIfNeeded()
 	case "q":
 		return m, tea.Quit
 	case "/":
@@ -580,25 +756,25 @@ func (m *Model) handleDashboardKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 		m.sortAsc = !m.sortAsc
 		m.refreshLive()
 	case "m":
-		if m.termWidth >= wideBreakpoint {
-			if m.focusedPanel == panelMaint {
-				m.maintOpen = false
-				m.focusedPanel = panelMonitors
-			} else {
-				m.maintOpen = true
-				m.focusedPanel = panelMaint
-			}
-			m.recalcLayout()
-		}
-	case "l":
-		if m.logsOpen {
-			m.logsOpen = false
+		if m.bottomPanel == bottomMaint {
+			m.bottomPanel = bottomNone
 			m.focusedPanel = panelMonitors
 		} else {
-			m.logsOpen = true
+			m.bottomPanel = bottomMaint
+			m.focusedPanel = panelMaint
+		}
+		m.recalcLayout()
+		return m, m.saveBottomPanelPref()
+	case "l":
+		if m.bottomPanel == bottomLogs {
+			m.bottomPanel = bottomNone
+			m.focusedPanel = panelMonitors
+		} else {
+			m.bottomPanel = bottomLogs
 			m.focusedPanel = panelLogs
 		}
 		m.recalcLayout()
+		return m, m.saveBottomPanelPref()
 	case "up", "k":
 		if m.focusedPanel == panelDetail && m.detailOpen {
 			m.detailScrollOffset--
@@ -675,6 +851,13 @@ func (m *Model) handleDashboardKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			return m, nil
 		}
 		if len(m.sites) > 0 {
+			narrow := m.termWidth < wideBreakpoint
+			if narrow {
+				m.detailMode = detailDefault
+				m.detailScrollOffset = 0
+				m.state = stateDetailFullscreen
+				return m, m.loadDetailCmd(m.sites[m.cursor].ID)
+			}
 			m.detailOpen = !m.detailOpen
 			m.detailMode = detailDefault
 			m.detailScrollOffset = 0
@@ -868,11 +1051,28 @@ func (m *Model) handleClick(msg tea.MouseMsg) (tea.Model, tea.Cmd) {
 		}
 	}
 
-	if m.maintOpen && m.zones.Get("panel-maint").InBounds(msg) {
+	if m.bottomPanel == bottomMaint && m.zones.Get("panel-maint").InBounds(msg) {
 		m.focusedPanel = panelMaint
+		_, relY := m.zones.Get("panel-maint").Pos(msg)
+		row := relY - 2
+		windows := m.activeMaintWindows()
+		if row >= 0 && row < len(windows) {
+			m.maintCursor = row
+		}
 		return m, nil
 	} else if m.zones.Get("panel-monitors").InBounds(msg) {
 		m.focusedPanel = panelMonitors
+		_, relY := m.zones.Get("panel-monitors").Pos(msg)
+		row := relY - 4 + m.tableOffset
+		if row >= 0 && row < len(m.sites) {
+			m.cursor = row
+			m.syncSelectedID()
+			if m.detailOpen {
+				m.detailScrollOffset = 0
+				return m, m.loadDetailCmd(m.sites[m.cursor].ID)
+			}
+		}
+		return m, nil
 	} else if m.zones.Get("panel-logs").InBounds(msg) {
 		m.focusedPanel = panelLogs
 		return m, nil
@@ -881,23 +1081,6 @@ func (m *Model) handleClick(msg tea.MouseMsg) (tea.Model, tea.Cmd) {
 		return m, nil
 	}
 
-	end := m.tableOffset + m.maxTableRows
-	if end > len(m.sites) {
-		end = len(m.sites)
-	}
-	for i := m.tableOffset; i < end; i++ {
-		if m.zones.Get(fmt.Sprintf("site-%d", i)).InBounds(msg) {
-			m.cursor = i
-			m.syncSelectedID()
-			m.focusedPanel = panelMonitors
-			if m.detailOpen {
-				m.detailScrollOffset = 0
-				return m, m.loadDetailCmd(m.sites[m.cursor].ID)
-			}
-			return m, nil
-		}
-	}
-
 	return m, nil
 }
 

internal/tui/update_test.go

@@ -300,6 +300,70 @@ func TestWriteDoneMsg_LogsErrorAndReloads(t *testing.T) {
 	}
 }
 
+func TestEnterNarrowTerminal_OpensFullscreen(t *testing.T) {
+	ms := &tuiMockStore{stateChanges: []models.StateChange{{FromStatus: "UP", ToStatus: "DOWN"}}}
+	m := newTestModel(ms)
+	m.sites = []models.Site{{SiteConfig: models.SiteConfig{ID: 1, Name: "site"}, SiteState: models.SiteState{Status: "UP"}}}
+	m.termWidth = 80 // narrow, below wideBreakpoint (120)
+	m.termHeight = 40
+	m.focusedPanel = panelMonitors
+
+	updated, cmd := (&m).handleDashboardKey(keyMsg("enter"))
+	got := updated.(*Model)
+	if got.state != stateDetailFullscreen {
+		t.Fatalf("expected stateDetailFullscreen, got %d", got.state)
+	}
+	if cmd == nil {
+		t.Fatal("expected a detail load Cmd")
+	}
+}
+
+func TestEnterWideTerminal_TogglesSidebar(t *testing.T) {
+	ms := &tuiMockStore{stateChanges: []models.StateChange{{FromStatus: "UP", ToStatus: "DOWN"}}}
+	m := newTestModel(ms)
+	m.sites = []models.Site{{SiteConfig: models.SiteConfig{ID: 1, Name: "site"}, SiteState: models.SiteState{Status: "UP"}}}
+	m.termWidth = 140 // wide, above wideBreakpoint (120)
+	m.termHeight = 40
+	m.focusedPanel = panelMonitors
+
+	updated, _ := (&m).handleDashboardKey(keyMsg("enter"))
+	got := updated.(*Model)
+	if got.state != stateDashboard {
+		t.Fatalf("expected stateDashboard, got %d", got.state)
+	}
+	if !got.detailOpen {
+		t.Fatal("expected detailOpen to be true")
+	}
+}
+
+func TestDetailFullscreen_EscReturnsToDashboard(t *testing.T) {
+	m := newTestModel(&tuiMockStore{})
+	m.state = stateDetailFullscreen
+	m.sites = []models.Site{{SiteConfig: models.SiteConfig{ID: 1, Name: "site"}}}
+
+	updated, _ := (&m).handleDetailFullscreen(tea.KeyMsg{Type: tea.KeyEsc})
+	got := updated.(*Model)
+	if got.state != stateDashboard {
+		t.Fatalf("expected stateDashboard after Esc, got %d", got.state)
+	}
+	if got.focusedPanel != panelMonitors {
+		t.Fatalf("expected panelMonitors focus, got %d", got.focusedPanel)
+	}
+}
+
+func TestDetailRefreshCmd_FiresForFullscreen(t *testing.T) {
+	ms := &tuiMockStore{stateChanges: []models.StateChange{{FromStatus: "UP", ToStatus: "DOWN"}}}
+	m := newTestModel(ms)
+	m.sites = []models.Site{{SiteConfig: models.SiteConfig{ID: 5, Name: "site"}}}
+	m.state = stateDetailFullscreen
+	m.detailOpen = false
+
+	cmd := (&m).detailRefreshCmd()
+	if cmd == nil {
+		t.Fatal("detailRefreshCmd should fire for stateDetailFullscreen")
+	}
+}
+
 func TestDetailRefreshCmd_OnlyWhileDetailOpen(t *testing.T) {
 	ms := &tuiMockStore{stateChanges: []models.StateChange{{FromStatus: "UP", ToStatus: "DOWN"}}}
 	m := newTestModel(ms)
@@ -325,3 +389,86 @@ func TestDetailRefreshCmd_OnlyWhileDetailOpen(t *testing.T) {
 		t.Error("refresh Cmd issued for an out-of-range cursor")
 	}
 }
+
+func TestBuildMaintSet_GlobalWindow(t *testing.T) {
+	m := newTestModel(&tuiMockStore{})
+	m.sites = []models.Site{
+		{SiteConfig: models.SiteConfig{ID: 1, Name: "a"}},
+		{SiteConfig: models.SiteConfig{ID: 2, Name: "b"}},
+	}
+	m.maintenanceWindows = []models.MaintenanceWindow{
+		{ID: 1, MonitorID: 0, Type: "maintenance", StartTime: time.Now().Add(-time.Hour)},
+	}
+	m.buildMaintSet()
+	if !m.maintSet[1] || !m.maintSet[2] {
+		t.Error("global maint window should mark all monitors")
+	}
+}
+
+func TestBuildMaintSet_TargetedWindow(t *testing.T) {
+	m := newTestModel(&tuiMockStore{})
+	m.sites = []models.Site{
+		{SiteConfig: models.SiteConfig{ID: 1, Name: "a"}},
+		{SiteConfig: models.SiteConfig{ID: 2, Name: "b"}},
+	}
+	m.maintenanceWindows = []models.MaintenanceWindow{
+		{ID: 1, MonitorID: 1, Type: "maintenance", StartTime: time.Now().Add(-time.Hour)},
+	}
+	m.buildMaintSet()
+	if !m.maintSet[1] {
+		t.Error("targeted window should mark monitor 1")
+	}
+	if m.maintSet[2] {
+		t.Error("targeted window should NOT mark monitor 2")
+	}
+}
+
+func TestBuildMaintSet_GroupPropagates(t *testing.T) {
+	m := newTestModel(&tuiMockStore{})
+	m.sites = []models.Site{
+		{SiteConfig: models.SiteConfig{ID: 10, Name: "group", Type: "group"}},
+		{SiteConfig: models.SiteConfig{ID: 11, Name: "child1", ParentID: 10}},
+		{SiteConfig: models.SiteConfig{ID: 12, Name: "child2", ParentID: 10}},
+		{SiteConfig: models.SiteConfig{ID: 20, Name: "other"}},
+	}
+	m.maintenanceWindows = []models.MaintenanceWindow{
+		{ID: 1, MonitorID: 10, Type: "maintenance", StartTime: time.Now().Add(-time.Hour)},
+	}
+	m.buildMaintSet()
+	if !m.maintSet[10] || !m.maintSet[11] || !m.maintSet[12] {
+		t.Error("group maint window should mark group + children")
+	}
+	if m.maintSet[20] {
+		t.Error("unrelated monitor should NOT be marked")
+	}
+}
+
+func TestBuildMaintSet_ExpiredIgnored(t *testing.T) {
+	m := newTestModel(&tuiMockStore{})
+	m.sites = []models.Site{
+		{SiteConfig: models.SiteConfig{ID: 1, Name: "a"}},
+	}
+	m.maintenanceWindows = []models.MaintenanceWindow{
+		{ID: 1, MonitorID: 1, Type: "maintenance",
+			StartTime: time.Now().Add(-2 * time.Hour),
+			EndTime:   time.Now().Add(-1 * time.Hour)},
+	}
+	m.buildMaintSet()
+	if m.maintSet[1] {
+		t.Error("expired maint window should not mark monitor")
+	}
+}
+
+func TestBuildMaintSet_IncidentIgnored(t *testing.T) {
+	m := newTestModel(&tuiMockStore{})
+	m.sites = []models.Site{
+		{SiteConfig: models.SiteConfig{ID: 1, Name: "a"}},
+	}
+	m.maintenanceWindows = []models.MaintenanceWindow{
+		{ID: 1, MonitorID: 0, Type: "incident", StartTime: time.Now().Add(-time.Hour)},
+	}
+	m.buildMaintSet()
+	if m.maintSet[1] {
+		t.Error("incident windows should not mark monitors as in maintenance")
+	}
+}

internal/tui/view_dashboard.go

@@ -92,6 +92,8 @@ func (m Model) View() string {
 		return ""
 	case stateLogs:
 		return m.viewLogsFullscreen()
+	case stateDetailFullscreen:
+		return m.viewDetailFullscreen()
 	case stateAlertDetail:
 		return m.viewAlertDetailPanel()
 	case stateSettings:
@@ -143,41 +145,27 @@ func (m Model) computeStats() dashboardStats {
 	return s
 }
 
-const maintSidebarW = 22
-
 func (m Model) viewMonitorsLayout() string {
 	availW := m.termWidth - chromePadH
 	wide := m.termWidth >= wideBreakpoint
 
-	showMaint := m.maintOpen && wide
 	showDetail := m.detailOpen && wide
 
-	var maintW, detailW, monW int
-	if showMaint {
-		maintW = maintSidebarW
-		if maintW > availW/4 {
-			maintW = availW / 4
-		}
-	}
-	remaining := availW - maintW
+	var detailW, monW int
 	if showDetail {
-		monW = remaining * 45 / 100
-		detailW = remaining - monW
+		monW = availW * 60 / 100
+		detailW = availW - monW
 	} else {
-		monW = remaining
+		monW = availW
 	}
 
 	m.contentWidth = monW - 2
 
+	monTargetH := m.maxTableRows + 5
 	monitors := m.viewSitesTab()
-	monPanel := m.zones.Mark("panel-monitors", m.titledPanel("Monitors", monitors, monW, m.focusedPanel == panelMonitors))
+	monPanel := m.zones.Mark("panel-monitors", m.titledPanelH("Monitors", monitors, "", monW, monTargetH, 0, scrollbar{pos: m.tableOffset, total: len(m.sites), visible: m.maxTableRows}, m.focusedPanel == panelMonitors))
 
 	var topParts []string
-	if showMaint {
-		sidebar := m.viewMaintSidebar(maintW-2, m.maxTableRows)
-		maintPanel := m.zones.Mark("panel-maint", m.titledPanel("Maint", sidebar, maintW, m.focusedPanel == panelMaint))
-		topParts = append(topParts, maintPanel)
-	}
 	topParts = append(topParts, monPanel)
 	if showDetail {
 		title := ""
@@ -193,16 +181,25 @@ func (m Model) viewMonitorsLayout() string {
 		monHeight := lipgloss.Height(monPanel)
 		detail := m.viewDetailInline(detailW-2, monHeight)
 		footer := m.detailFooter(detailW - 2)
-		detailPanel := m.zones.Mark("panel-detail", m.titledPanelH(title, detail, footer, detailW, monHeight, m.detailScrollOffset, m.focusedPanel == panelDetail))
+		detailPanel := m.zones.Mark("panel-detail", m.titledPanelH(title, detail, footer, detailW, monHeight, m.detailScrollOffset, scrollbar{}, m.focusedPanel == panelDetail))
 		topParts = append(topParts, detailPanel)
 	}
 
 	top := lipgloss.JoinHorizontal(lipgloss.Top, topParts...)
 
-	if m.logsOpen {
-		logContent := m.viewLogsStrip(availW-2, logsStripHeight-2)
-		logPanel := m.zones.Mark("panel-logs", m.titledPanel("Logs", logContent, availW, m.focusedPanel == panelLogs))
+	switch m.bottomPanel {
+	case bottomLogs:
+		maxLines := logsStripHeight - 2
+		logContent := m.viewLogsStrip(availW-2, maxLines)
+		totalLogs := m.filteredLogCount()
+		logPanel := m.zones.Mark("panel-logs", m.titledPanelH("Logs", logContent, "", availW, logsStripHeight, 0, scrollbar{pos: m.logScrollOffset, total: totalLogs, visible: maxLines}, m.focusedPanel == panelLogs))
 		return top + "\n" + logPanel
+	case bottomMaint:
+		maxLines := logsStripHeight - 2
+		maintContent := m.viewMaintStrip(availW-2, maxLines)
+		totalMaint := len(m.activeMaintWindows())
+		maintPanel := m.zones.Mark("panel-maint", m.titledPanelH("Maint", maintContent, "", availW, logsStripHeight, 0, scrollbar{pos: 0, total: totalMaint, visible: maxLines}, m.focusedPanel == panelMaint))
+		return top + "\n" + maintPanel
 	}
 	return top
 }
@@ -296,7 +293,7 @@ func (m Model) renderFooter(_ dashboardStats) string {
 
 	var parts []string
 	if m.focusedPanel == panelMaint {
-		parts = []string{m.hotkey("n", "New"), m.hotkey("x", "End"), m.hotkey("d", "Del"), m.hotkey("Esc", "Back")}
+		parts = []string{m.hotkey("n", "New"), m.hotkey("Enter", "Detail"), m.hotkey("x", "End"), m.hotkey("d", "Del"), m.hotkey("m/Esc", "Back")}
 	} else if m.focusedPanel == panelLogs {
 		parts = []string{m.hotkey("↑/↓", "Scroll"), m.hotkey("Enter", "Expand"), m.hotkey("l/Esc", "Back")}
 	} else if m.detailOpen && m.detailMode == detailSLA {
@@ -304,7 +301,7 @@ func (m Model) renderFooter(_ dashboardStats) string {
 	} else if m.detailOpen && m.detailMode == detailHistory {
 		parts = []string{m.hotkey("Esc", "Back")}
 	} else if m.detailOpen {
-		parts = []string{m.hotkey("Enter", "Close"), m.hotkey("h", "History"), m.hotkey("s", "SLA"), m.hotkey("e", "Edit"), m.hotkey("m", "Maint")}
+		parts = []string{m.hotkey("Enter", "Close"), m.hotkey("h", "History"), m.hotkey("s", "SLA"), m.hotkey("e", "Edit")}
 	} else {
 		parts = []string{m.hotkey("/", "Filter"), m.hotkey("Enter", "Detail")}
 		if m.cursor < len(m.sites) && m.sites[m.cursor].Type == "group" {
@@ -314,9 +311,9 @@ func (m Model) renderFooter(_ dashboardStats) string {
 				parts = append(parts, m.hotkey("Space", "Collapse"))
 			}
 		}
-		parts = append(parts, m.hotkey("n", "New"), m.hotkey("e", "Edit"), m.hotkey("d", "Del"), m.hotkey("m", "Maint"))
+		parts = append(parts, m.hotkey("n", "New"), m.hotkey("e", "Edit"), m.hotkey("d", "Del"))
 	}
-	parts = append(parts, m.hotkey("l", "Logs"), m.hotkey("S", "Settings"), m.hotkey("T", "Theme"), m.hotkey("q", "Quit"))
+	parts = append(parts, m.hotkey("m", "Maint"), m.hotkey("l", "Logs"), m.hotkey("S", "Settings"), m.hotkey("T", "Theme"), m.hotkey("q", "Quit"))
 
 	line := strings.Join(parts, dot)
 	if m.filterText != "" {

internal/tui/view_detail_inline.go

@@ -2,6 +2,7 @@ package tui
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -22,20 +23,72 @@ func (m Model) viewDetailInline(width, height int) string {
 	default:
 		site := m.sites[m.cursor]
 		hist, _ := m.engine.GetHistory(site.ID)
-		return m.viewDetailSidebar(site, hist, width, height)
+		return m.buildDetailContent(site, hist, width, false)
 	}
 }
 
-func (m Model) viewDetailSidebar(site models.Site, hist monitor.SiteHistory, width, _ int) string {
+func (m Model) viewDetailFullscreen() string {
+	if m.cursor >= len(m.sites) {
+		return ""
+	}
+
+	availW := m.termWidth - chromePadH
+	site := m.sites[m.cursor]
+
+	var title string
+	switch m.detailMode {
+	case detailSLA:
+		title = "SLA · " + site.Name
+	case detailHistory:
+		title = "History · " + site.Name
+	default:
+		title = site.Name
+	}
+
+	if site.ParentID > 0 {
+		for _, s := range m.sites {
+			if s.ID == site.ParentID {
+				title = s.Name + " > " + title
+				break
+			}
+		}
+	}
+
+	innerW := availW - 2
+
+	var content string
+	switch m.detailMode {
+	case detailSLA:
+		content = m.viewSLASidebar(innerW, 0)
+	case detailHistory:
+		content = m.viewHistorySidebar(innerW, 0)
+	default:
+		hist, _ := m.engine.GetHistory(site.ID)
+		content = m.buildDetailContent(site, hist, innerW, true)
+	}
+
+	footer := m.detailFooter(innerW)
+
+	panelH := m.termHeight - chromePadV
+	if panelH < 10 {
+		panelH = 10
+	}
+
+	return lipgloss.NewStyle().Padding(1, 2).Render(
+		m.titledPanelH(title, content, footer, availW, panelH, m.detailScrollOffset, scrollbar{}, true))
+}
+
+func (m Model) buildDetailContent(site models.Site, hist monitor.SiteHistory, width int, fullscreen bool) string {
 	dot := m.st.subtleStyle.Render(" · ")
 	label := m.st.subtleStyle
-	var b strings.Builder
 	innerW := width - 4
 	if innerW < 20 {
 		innerW = 20
 	}
 
-	// Status + latency + last check
+	var b strings.Builder
+
+	// Status + latency + last check + state since
 	status := m.fmtStatus(site.Status, site.Paused, m.isMonitorInMaintenance(site.ID))
 	statusParts := []string{status}
 	if site.Latency > 0 {
@@ -44,6 +97,10 @@ func (m Model) viewDetailSidebar(site models.Site, hist monitor.SiteHistory, wid
 	if !site.LastCheck.IsZero() {
 		statusParts = append(statusParts, m.fmtTimeAgo(site.LastCheck))
 	}
+	if !site.StatusChangedAt.IsZero() {
+		dur := time.Since(site.StatusChangedAt)
+		statusParts = append(statusParts, label.Render("for")+" "+fmtDuration(dur))
+	}
 	b.WriteString("  " + strings.Join(statusParts, dot) + "\n")
 
 	// Type-specific details
@@ -52,13 +109,33 @@ func (m Model) viewDetailSidebar(site models.Site, hist monitor.SiteHistory, wid
 		b.WriteString("  " + strings.Join(typeParts, dot) + "\n")
 	}
 
-	// Uptime + retries
-	uptimeParts := []string{label.Render("Uptime") + " " + m.fmtUptime(hist.Statuses)}
+	// Extended endpoint fields
+	m.writeEndpointFields(&b, site, label, innerW, fullscreen)
+
+	// Uptime + retries + last success
+	uptimeStr := m.fmtUptime(hist.Statuses)
+	if m.isMonitorInMaintenance(site.ID) {
+		uptimeStr = m.st.subtleStyle.Render("—")
+	}
+	uptimeParts := []string{label.Render("Uptime") + " " + uptimeStr}
 	if site.Type != "group" && site.MaxRetries > 0 {
 		uptimeParts = append(uptimeParts, label.Render("Retries")+" "+m.fmtRetries(site))
 	}
+	if site.Type != "push" && !site.LastSuccessAt.IsZero() {
+		uptimeParts = append(uptimeParts, label.Render("Last OK")+" "+m.fmtTimeAgo(site.LastSuccessAt))
+	}
 	b.WriteString("  " + strings.Join(uptimeParts, dot) + "\n")
 
+	// Maintenance window name
+	if m.isMonitorInMaintenance(site.ID) {
+		for _, mw := range m.maintenanceWindows {
+			if mw.Type == "maintenance" && (mw.MonitorID == 0 || mw.MonitorID == site.ID || mw.MonitorID == site.ParentID) {
+				b.WriteString("  " + label.Render("Maint") + " " + m.st.maintStyle.Render(mw.Title) + "\n")
+				break
+			}
+		}
+	}
+
 	// Error line
 	if (site.Status == models.StatusDown || site.Status == models.StatusSSLExp ||
 		site.Status == models.StatusLate || site.Status == models.StatusStale) && site.LastError != "" {
@@ -69,8 +146,62 @@ func (m Model) viewDetailSidebar(site models.Site, hist monitor.SiteHistory, wid
 		b.WriteString("  " + label.Render("Error") + " " + m.st.dangerStyle.Render(limitStr(site.LastError, errW)) + "\n")
 	}
 
+	// Connection chain
+	if (site.Status == models.StatusDown || site.Status == models.StatusSSLExp) && site.LastError != "" {
+		chain := connectionChain(site.LastError, site.Type, site.StatusCode, strings.HasPrefix(site.URL, "https"))
+		if len(chain) > 0 {
+			b.WriteString("\n")
+			for _, step := range chain {
+				var icon string
+				switch step.Status {
+				case stepPassed:
+					icon = m.st.specialStyle.Render("✓")
+				case stepFailed:
+					icon = m.st.dangerStyle.Render("✗")
+				case stepSkipped:
+					icon = m.st.subtleStyle.Render("·")
+				}
+				line := fmt.Sprintf("  %s %-16s", icon, step.Name)
+				if step.Detail != "" {
+					switch step.Status {
+					case stepFailed:
+						line += " " + m.st.dangerStyle.Render(step.Detail)
+					case stepSkipped:
+						line += " " + m.st.subtleStyle.Render(step.Detail)
+					}
+				}
+				b.WriteString(line + "\n")
+			}
+		}
+	}
+
 	b.WriteString("\n")
 
+	// Probe results
+	probeResults := m.engine.GetProbeResults(site.ID)
+	if len(probeResults) > 0 {
+		nodeIDs := make([]string, 0, len(probeResults))
+		for id := range probeResults {
+			nodeIDs = append(nodeIDs, id)
+		}
+		sort.Strings(nodeIDs)
+		for _, nodeID := range nodeIDs {
+			result := probeResults[nodeID]
+			probeStatus := m.st.specialStyle.Render("UP")
+			if !result.IsUp {
+				probeStatus = m.st.dangerStyle.Render("DN")
+			}
+			latency := time.Duration(result.LatencyNs).Milliseconds()
+			ago := time.Since(result.CheckedAt).Truncate(time.Second)
+			line := fmt.Sprintf("  %-14s %s  %dms  %s ago", nodeID, probeStatus, latency, ago)
+			if !result.IsUp && result.ErrorReason != "" {
+				line += "  " + m.st.dangerStyle.Render(result.ErrorReason)
+			}
+			b.WriteString(line + "\n")
+		}
+		b.WriteString("\n")
+	}
+
 	// Latency chart
 	if len(hist.Latencies) > 0 {
 		chart := m.latencyChart(hist.Latencies, hist.Statuses, innerW, 3)
@@ -112,6 +243,15 @@ func (m Model) viewDetailSidebar(site models.Site, hist monitor.SiteHistory, wid
 		}
 	}
 
+	// Latency histogram
+	if site.Type != "push" && len(hist.Latencies) > 5 {
+		histContent := m.latencyHistogram(hist.Latencies, hist.Statuses, innerW)
+		if histContent != "" {
+			b.WriteString("\n")
+			b.WriteString(histContent)
+		}
+	}
+
 	b.WriteString("\n")
 
 	// State changes
@@ -146,6 +286,47 @@ func (m Model) viewDetailSidebar(site models.Site, hist monitor.SiteHistory, wid
 	return lipgloss.NewStyle().Width(width).MaxWidth(width).Render(b.String())
 }
 
+func (m Model) writeEndpointFields(b *strings.Builder, site models.Site, label lipgloss.Style, innerW int, fullscreen bool) {
+	dot := m.st.subtleStyle.Render(" · ")
+	var fields []string
+
+	if site.Interval > 0 {
+		fields = append(fields, label.Render("Every")+" "+fmt.Sprintf("%ds", site.Interval))
+	}
+	if site.Timeout > 0 {
+		fields = append(fields, label.Render("Timeout")+" "+fmt.Sprintf("%ds", site.Timeout))
+	}
+	if site.Type == "http" && site.Method != "" && site.Method != "GET" {
+		fields = append(fields, label.Render("Method")+" "+site.Method)
+	}
+	if site.Type == "http" {
+		codes := site.AcceptedCodes
+		if codes == "" {
+			codes = "200-299"
+		}
+		fields = append(fields, label.Render("Codes")+" "+codes)
+	}
+	if site.Regions != "" {
+		fields = append(fields, label.Render("Regions")+" "+site.Regions)
+	}
+
+	if len(fields) > 0 {
+		b.WriteString("  " + strings.Join(fields, dot) + "\n")
+	}
+
+	if site.Description != "" {
+		maxDescW := innerW
+		if !fullscreen && maxDescW > 60 {
+			maxDescW = 60
+		}
+		b.WriteString("  " + label.Render(limitStr(site.Description, maxDescW)) + "\n")
+	}
+
+	if site.Type == "push" && site.Token != "" {
+		b.WriteString("  " + label.Render("Token") + " " + site.Token + "\n")
+	}
+}
+
 func (m Model) detailTypeLine(site models.Site) []string {
 	label := m.st.subtleStyle
 	var parts []string
@@ -210,34 +391,27 @@ func (m Model) detailTypeLine(site models.Site) []string {
 	return parts
 }
 
-func (m Model) detailKeys() string {
-	return m.st.subtleStyle.Render("[e] Edit  [h] History  [s] SLA  [Esc] Back")
-}
-
 func (m Model) detailFooter(width int) string {
-	label := m.st.subtleStyle
-	var lines []string
+	dot := m.st.subtleStyle.Render(" · ")
+	var parts []string
 
 	switch m.detailMode {
 	case detailSLA:
-		var keys []string
 		for i, p := range slaPeriods {
-			k := fmt.Sprintf("[%s] %s", p.key, p.label)
 			if i == m.slaPeriodIdx {
-				keys = append(keys, m.st.titleStyle.Render(k))
+				parts = append(parts, m.st.titleStyle.Render(p.key)+" "+m.st.titleStyle.Render(p.label))
 			} else {
-				keys = append(keys, label.Render(k))
+				parts = append(parts, m.hotkey(p.key, p.label))
 			}
 		}
-		lines = append(lines, "  "+strings.Join(keys, " "))
-		lines = append(lines, "  "+label.Render("[Esc] Back"))
+		parts = append(parts, m.hotkey("Esc", "Back"))
 	case detailHistory:
-		lines = append(lines, "  "+label.Render("[Esc] Back"))
+		parts = append(parts, m.hotkey("Esc", "Back"))
 	default:
-		lines = append(lines, "  "+m.detailKeys())
+		parts = append(parts, m.hotkey("e", "Edit"), m.hotkey("h", "History"), m.hotkey("s", "SLA"), m.hotkey("Esc", "Back"))
 	}
 
-	content := strings.Join(lines, "\n")
+	content := "  " + strings.Join(parts, dot)
 	return lipgloss.NewStyle().Width(width).MaxWidth(width).Render(content)
 }
 

internal/tui/view_maint_sidebar.go

@@ -7,6 +7,7 @@ import (
 
 	"gitea.lerkolabs.com/lerkolabs/uptop/internal/models"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/lipgloss/table"
 )
 
 func (m Model) viewMaintDetailPanel() string {
@@ -85,6 +86,15 @@ func (m Model) viewMaintDetailPanel() string {
 	return lipgloss.NewStyle().Padding(1, 2).Render(b.String())
 }
 
+func (m Model) monitorNameByID(id int) string {
+	for _, s := range m.engine.GetAllSites() {
+		if s.ID == id {
+			return s.Name
+		}
+	}
+	return fmt.Sprintf("#%d", id)
+}
+
 func (m Model) activeMaintWindows() []models.MaintenanceWindow {
 	now := time.Now()
 	var out []models.MaintenanceWindow
@@ -97,34 +107,26 @@ func (m Model) activeMaintWindows() []models.MaintenanceWindow {
 	return out
 }
 
-func (m Model) viewMaintSidebar(width, maxLines int) string {
+func (m Model) viewMaintStrip(width, maxLines int) string {
 	windows := m.activeMaintWindows()
 	if len(windows) == 0 {
-		return m.st.subtleStyle.Render(" No active maintenance")
+		return m.st.subtleStyle.Render("  No active maintenance")
 	}
 
-	contentW := width - 2
-	if contentW < 10 {
-		contentW = 10
-	}
-
-	start := m.maintOffset
-	if start > len(windows) {
-		start = len(windows)
-	}
-	linesUsed := 0
-	end := start
-	for end < len(windows) && linesUsed+2 <= maxLines {
-		linesUsed += 2
-		end++
-	}
-
-	var lines []string
 	now := time.Now()
-	for i := start; i < end; i++ {
-		mw := windows[i]
-		selected := m.focusedPanel == panelMaint && i == m.maintCursor
+	end := maxLines
+	if end > len(windows) {
+		end = len(windows)
+	}
 
+	selectedVisual := -1
+	if m.focusedPanel == panelMaint {
+		selectedVisual = m.maintCursor
+	}
+
+	var rows [][]string
+	for i := 0; i < end; i++ {
+		mw := windows[i]
 		isActive := !mw.StartTime.After(now) && (mw.EndTime.IsZero() || mw.EndTime.After(now))
 
 		var icon string
@@ -134,37 +136,51 @@ func (m Model) viewMaintSidebar(width, maxLines int) string {
 			icon = m.st.warnStyle.Render("○")
 		}
 
-		title := limitStr(mw.Title, contentW-3)
-		titleLine := " " + icon + " " + title
+		monName := "All Monitors"
+		if mw.MonitorID > 0 {
+			monName = m.monitorNameByID(mw.MonitorID)
+		}
 
-		var detail string
+		var status string
 		if isActive {
 			if mw.EndTime.IsZero() {
-				detail = m.st.subtleStyle.Render("active · indefinite")
+				status = "indefinite"
 			} else {
-				remaining := time.Until(mw.EndTime)
-				detail = m.st.subtleStyle.Render("active · " + fmtDuration(remaining))
+				status = fmtDuration(time.Until(mw.EndTime)) + " left"
 			}
 		} else {
-			detail = m.st.subtleStyle.Render(mw.StartTime.Format("Jan 02") + " · " + fmtDuration(mw.EndTime.Sub(mw.StartTime)))
-		}
-		detailLine := "   " + limitStr(detail, contentW-3)
-
-		if selected {
-			sel := m.st.tableSelectedStyle
-			titleLine = sel.Render(lipgloss.NewStyle().Width(contentW).Render(titleLine))
-			detailLine = sel.Render(lipgloss.NewStyle().Width(contentW).Render(detailLine))
+			status = "starts " + mw.StartTime.Format("Jan 02 15:04")
 		}
 
-		lines = append(lines, titleLine, detailLine)
+		rows = append(rows, []string{icon, mw.Title, monName, status})
 	}
 
-	if len(windows) > end-start {
-		more := fmt.Sprintf(" %d more", len(windows)-(end-start))
-		lines = append(lines, m.st.subtleStyle.Render(more))
-	}
+	colWidths := []int{3, 0, 0, 0}
+	remaining := width - colWidths[0] - 6
+	colWidths[1] = remaining * 40 / 100
+	colWidths[2] = remaining * 30 / 100
+	colWidths[3] = remaining - colWidths[1] - colWidths[2]
 
-	return strings.Join(lines, "\n")
+	t := table.New().
+		Border(lipgloss.HiddenBorder()).
+		Width(width).
+		Rows(rows...).
+		StyleFunc(func(row, col int) lipgloss.Style {
+			isSelected := row == selectedVisual
+			base := m.st.tableCellStyle
+			if row%2 == 1 {
+				base = m.st.tableZebraStyle
+			}
+			if isSelected {
+				base = m.st.tableSelectedStyle
+			}
+			if col < len(colWidths) && colWidths[col] > 0 {
+				base = base.Width(colWidths[col]).MaxWidth(colWidths[col])
+			}
+			return base
+		})
+
+	return t.Render()
 }
 
 func (m *Model) scrollMaintCursor(delta int) {
@@ -180,14 +196,4 @@ func (m *Model) scrollMaintCursor(delta int) {
 	if m.maintCursor >= total {
 		m.maintCursor = total - 1
 	}
-	if m.maintCursor < m.maintOffset {
-		m.maintOffset = m.maintCursor
-	}
-	visible := m.maxTableRows / 2
-	if visible < 1 {
-		visible = 1
-	}
-	if m.maintCursor >= m.maintOffset+visible {
-		m.maintOffset = m.maintCursor - visible + 1
-	}
 }