Fixes for header elements getting bunched