fixed main page
ready to merge
Merge branch 'dev-async-userpage' into dev
Merge branch 'dev'