Tidied up CSS a bit (still pretty hacky)