Big restructure of the html