Lots of user stuff
Changed app name and fixed html