Improved the UI