Work on #46
Merge pull request #47 from mozilla/46-alter-custom-fields

[46] Adjust Custom Fields