Improves styles and markup a bit.