Tidy up.

Tidied up the code for the styles, etc. Also updated the UI to reflect
the most recent discussions.
Started adding icons.