Tweaking CSS and HTML a bit