Feature/collection form buttons

This just simplifies adding form fields.