Fixing bugs
Merge pull request #35 from SamLau95/createNPOForm

Fixing bugs