Markup and styling improved overall