added icons and sorted menu items