Some improvements in UI