tidied scss, playing around with sections
Fixed merge issue