Worked with Malika to make several stylistic changes & fixed header bug
Worked with Malika to fix merge conflict