Added CSS + tidied up