Use select box for modes
Cosmetic changes