Add highlighting on clicking
Add highlighting from dropdown
Split setting and unsetting active into seperate functions