more improvement in the UI