improving the UI