Add full_rake, reorder form fields