Refactor the toolbar and user account view
Cleanup user account view
Fix typo