working on User panel
UserPanel Merge Conflict Resolved