a lot of cleanup
UI tweaks.