#6: improve html structure