Added mockup for header
Resolved merge conflict