Start refactoring to moved shared elements into their own templates
Improved Faker seeds, continued refactoring to DRY code