new UI, cleanup and tweaks