Added tags, refactored with factory girl, added some CSS and JS