Improve layout, css and html.