HTML + JS changes

simplified the html markup, the JS now generates the required html