Adds design for header
Re-fixes conflicts