ui related bug fixes by nimesh