master - NEW: updating
master - NEW: cleaning up and fixing the html and javascript a bit