added button for switch, and rewritten highligts view