Move to nested form
Change patch adding scheme
set up form for patches