Condenced new_collection and collection_edit templates into one, added error handling