SCP - Policy client widget restructure