More UI changes
conflict fix