Cleanup only...
Misc UI improvements