CP - Policy switcher style tweak