Various design updates
Fixed conflict in header.scss