Added Role join model and fixed up forms