More UI updates
Fixed merge conflicts