Add quit button, and highlighting