changed the layout for user management
merged conflict