Some UI changes done