Added a little CSS and refactored some of the JS