Move shapes into main html template