combined two tasks forms into one, formatted pages, put differences directly in the edit and new files