Fix for menu not highlighting properly