Adding cancel button and fixing collection id to be noid while I'm at it.  fixes #4044