Added user roles and permissions, made adjustments to the views