more cosmetic changes, different keypress for switching modes