Fixed the form for edit type
Fixed more of the edit pages