Updates to modularize parts of form