moved form creation from the partial to the parent pages, minor other edits.