fixes and html refactoring
User page changed