Added new icons and better searching