Improved the icons and UI