Tidied up some things
Updated style sheet
Resolved merge conflict