change svgdrawer and HTML to new Layout