highlight function adds .active class, no CSS yet
Merge remote-tracking branch 'origin/master'