Merge branch 'users-list'
css fix
fixes
Realized users showing
Fixed Add button for admin
Added edit button for roles