put popover back in for main herobox #890
fix missing username bug
Merge branch 'master' into develop