More cleanup, almost in a usable state.
Lots of code refactoring and changes to the screen layouts.