User header button, UI fixes
Merge branch 'UIfix' into develop