#14438 Few improvements in UI