NewProjectModal refactor