Update to CSS-style and some corrections.