phase 1 UI updates done