Highlight Fixes

Fixes the color changes made on click with menu items