highlight performance increased + design tweaks