Merge pull request #107 from calblueprint/refactor

Fixing various issues
Merge pull request #108 from calblueprint/refactor

Refactor Part Deux
Add more thumbnails, forgot some oops