security reworked and roles form simplified