Added back header + merged css