reworked the html structure