UI almost done
new UI - almost done