UI changes added