Fix upload form, remove debug logs
Change collection structure, fix upload form button