Polish Project Form, refactor, edit notes