created menu for roles and users
merged conflicts