Cleanup the HTML, added some logic to Draw