improved css, html and tests