Adding UI changes