added roles and renamed jsps