new UI. some fixes