Partial collections/forms replaced longer forms; some code refactored