Improved the html-structure (Project #36)