Cleanup and a couple of ui tweaks