Fixes for menu highlighting