Tidied up CSS/JS