Module improvements#6

NikkoJT wants to merge 14 commits intodevfolkarps/FA-admin:devfrom

module-improvementsfolkarps/FA-admin:module-improvementsCopy head branch name to clipboard