Fix scroll bug where the wrong row was being highlighted
Tweak to menu style