Refactor Project form

[Finishes #44747999]