Tidied up some CSS and html, no longer has Square class