user page markup added
main page markup fixed
main page markup fixed
merge user.html