Added more graphics, cleaned up the DOM, refactored some code