diff --git a/pkg/cmd/dev.go b/pkg/cmd/dev.go
index e5eebe5..3fa926a 100644
--- a/pkg/cmd/dev.go
+++ b/pkg/cmd/dev.go
@@ -387,6 +387,12 @@ func runPreview(ctx context.Context, cmd *cli.Command) error {
 		if !cmd.Bool("watch") {
 			break
 		}
+
+		// Clear the screen and move the cursor to the top
+		fmt.Print("\nRebuilding...\n\n\033[2J\033[H")
+		os.Stdout.Sync()
+		Property("branch", selectedBranch)
+		Property("targets", strings.Join(selectedTargets, ", "))
 	}
 	return nil
 }
diff --git a/pkg/cmd/dev_view.go b/pkg/cmd/dev_view.go
index 3075d1d..9ad3484 100644
--- a/pkg/cmd/dev_view.go
+++ b/pkg/cmd/dev_view.go
@@ -105,10 +105,10 @@ var parts = []struct {
 		},
 	},
 	{
-		name: "diagnostics",
+		name: "build diagnostics",
 		view: func(m BuildModel, s *strings.Builder) {
 			if m.diagnostics == nil {
-				s.WriteString(SProperty(0, "diagnostics", "waiting for build to finish"))
+				s.WriteString(SProperty(0, "build diagnostics", "(waiting for build to finish)"))
 			} else {
 				s.WriteString(ViewDiagnosticsPrint(m.diagnostics, 10))
 			}
@@ -362,7 +362,7 @@ func ViewDiagnosticsPrint(diagnostics []stainless.BuildDiagnostic, maxDiagnostic
 			}
 		}
 
-		s.WriteString(SProperty(0, "diagnostics", summary))
+		s.WriteString(SProperty(0, "build diagnostics", summary))
 		s.WriteString(lipgloss.NewStyle().
 			Padding(0).
 			Border(lipgloss.RoundedBorder()).
@@ -370,7 +370,7 @@ func ViewDiagnosticsPrint(diagnostics []stainless.BuildDiagnostic, maxDiagnostic
 			Render(strings.TrimRight(sub.String(), "\n")),
 		)
 	} else {
-		s.WriteString(SProperty(0, "diagnostics", "(no errors or warnings)"))
+		s.WriteString(SProperty(0, "build diagnostics", "(no errors or warnings)"))
 	}
 
 	return s.String()
diff --git a/pkg/cmd/lint.go b/pkg/cmd/lint.go
index 3d511eb..991464f 100644
--- a/pkg/cmd/lint.go
+++ b/pkg/cmd/lint.go
@@ -56,6 +56,7 @@ type lintModel struct {
 	diagnostics []stainless.BuildDiagnostic
 	error       error
 	watching    bool
+	skipped     bool
 	canSkip     bool
 	ctx         context.Context
 	cmd         *cli.Command
@@ -77,6 +78,7 @@ func (m lintModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m, tea.Quit
 		} else if msg.String() == "enter" {
 			m.watching = false
+			m.skipped = true
 			return m, tea.Quit
 		}
 
@@ -124,10 +126,16 @@ func (m lintModel) View() string {
 	if m.error != nil {
 		content = "Linting failed!"
 	} else if m.diagnostics == nil {
-		content = m.spinner.View() + " Linting"
+		if m.skipped {
+			content = "Skipped!"
+		} else {
+			content = m.spinner.View() + " Linting"
+		}
 	} else {
 		content = ViewDiagnosticsPrint(m.diagnostics, -1)
-		if m.watching {
+		if m.skipped {
+			content += "\nContinuing..."
+		} else if m.watching {
 			content += "\n" + m.spinner.View() + " Waiting for configuration changes"
 		}
 	}