Merge pull request #36 from seavor/jay

item/option pages complete