Updated UI, added saving roles logic