refactoring other issues in #291
Merge pull request #306 from DonutWorks/feature/refactoring-user-page-ver2

refactoring other issues in #291