Updates too CSS for Header and navbar
resolve merge conflicts