Don't overwrite top/bottom margins
Fix the header border color