UI Tweak - Removed some highlights