Adding UI changes to make the UI elegant