Refactor Project form cont.