Finished first version of new UI