header and sidebar fixes
Merge branch 'master' of https://github.com/iordan93/Team-Solidaster