Adding some UI changes