UI changes
merged UI Changes