[issue947] Improved the UI of the edit profile page

Manual merge commit due to old code. This will close #215.