Adapted HTML structure (issue #47)