Rejiggered some class names and CSS.