switch from account to userid

and a lot of html clean up