some cleanup, added an icon
Rearranged the Collect example