CSS updated, html changed