Cleaned up TUI menu logic