Ajay/Pooja | #3143 | More ui fixes