Feature/menu highlighting