Improving the UI