Merge changes - responsive header with some styles commented out