Misc fixes, new UI