new UI refactor implemented, not tested