Fixing forms sigh
Merge conflicts
Merge pull request #26 from SamLau95/npoForm

Fixing forms sigh