Change add form flows

closes #343 
closes #342 
closes #361
closes #293