Version 2, html/CSS changes