Fixing collection event structure, adding icons to buttons, minor bug fixes