Issue 1899 minor ui changes