Improving the UI and speed