Added a bunch of layout work, including counts for trends
Add factory-boy for tests