Merge pull request #80 from seavor/jay

handoff
Commit before making dramatic changes to option stuff
Restructure the items controller
( few minor bug fixes on that page )
Merge pull request #81 from seavor/polina

Polina