Updated user page

And fixed markup for home