HTML restructure