Working on collections form logic and more view clean up