Adding additional structure to HTML and improving CSS styling