Major refactor of markup and styles

* Nearly at version 1.0.