Edited header section and finished up css
Resolved merge conflict