beautified html, and moved some ids to classes, un-nested when not needed