Finished majority of the new UI