Updated header styles
Updated footer styles
Resolved merge conflict
Continued footer styles