UI changes, removed cruft
Cleanup