header css and correction
fix merge