added dropdown for selecting role
merged changes from remote