Reworking the UI.  This is a breaking commit as I am in the middle of changing the UI.