Improved the UI and changed some icons