Update CSS and HTML re design