Menu highlighting take 2