Updated html, and 'views'