much needed cleanups in the site header