diff --git a/pkg/tui/account.go b/pkg/tui/account.go
index 424250a..3bc0476 100644
--- a/pkg/tui/account.go
+++ b/pkg/tui/account.go
@@ -18,24 +18,15 @@ func (m Model) BuildAccountView(availableHeight int) string {
 	leftPanel := ""
 	for i, item := range models.AccountMenuItems {
 		if m.AccountCursor == i {
-			style := lipgloss.NewStyle().
-				Background(m.theme.Highlight()).
-				Foreground(m.theme.Accent()).
-				Padding(0, 1).
-				Width(leftWidth - 2).
-				Align(lipgloss.Left)
+			style := m.theme.Base().Background(m.theme.Highlight()).Foreground(m.theme.Accent()).Padding(0, 1).Width(leftWidth - 2).Align(lipgloss.Left)
 			leftPanel += style.Render(item) + "\n"
 		} else {
-			style := lipgloss.NewStyle().
-				Foreground(m.theme.Body()).
-				Padding(0, 1).
-				Width(leftWidth - 2).
-				Align(lipgloss.Left)
+			style := m.theme.TextBody().Padding(0, 1).Width(leftWidth - 2).Align(lipgloss.Left)
 			leftPanel += style.Render(item) + "\n"
 		}
 	}
 
-	leftContainer := lipgloss.NewStyle().
+	leftContainer := m.theme.Base().
 		Width(leftWidth)
 
 	// Build the detail view (right panel) based on cursor position
diff --git a/pkg/tui/payment_form.go b/pkg/tui/payment_form.go
index de65aec..ef52a8f 100644
--- a/pkg/tui/payment_form.go
+++ b/pkg/tui/payment_form.go
@@ -416,7 +416,7 @@ func (m Model) PaymentUpdate(msg tea.Msg) (Model, tea.Cmd) {
 		return m, nil
 
 	case PaymentFormCompleteMsg:
-		if m.PaymentForm != nil {
+		if m.PaymentForm != nil && !m.PaymentForm.submitting {
 			m.PaymentForm.submitting = true
 			return m, m.saveCardOnlyCmd(msg)
 		}