Minor margin/padding fixes for headers