BRID 219: Cleanup functional permissions screen