new UI and bugfixes