Updated forms to use correct layout