Cleanup and new UI element, mostly for supporting CloudSeed