The next set of stuff that cleans up the UI

...es