fix policy UI imporovements