Fixing menu highlighting