Fix conflict and wrapup user pages
Merge pull request #25 from namvuonghcm/userpagefix

Fix conflict and wrapup user pages