mostly working new UI