Add ability to edit user info
Fix text alignment
Merge