User page fixed
Merge remote-tracking branch 'gg/master'