UI intergration phase1
UI almost done
new UI - almost done