convert html to haml
Update factory to include associations
Views cleanup
User views cart page