Refactors and fixes testing and factories
Initial CSS and coloring
Merge branch 'dev'