fix weird css, fix account deletion
merge master
merge public
Merge branch 'master' into public