Updated styles and markup.
Fixed tests.