Mostly debugging.
Testing this back to build 30.
Fixing some nagging display issues.
Bringing some consistency to the dialogs.