added styling
Fixed merge conflicts
Merge branch 'emmylucille-framework'