Start refactoring the header elements a bit