Major overhaul to the UI, less cluttered, hopefully more directed and
clearer.