Convert system module to namespaced forms

plus a few other related fixes
Fix accidental edit
Minor clean up
More fixes
Merge pull request #181 from geekwright/forms2

Convert system module to namespaced forms