Added some things to setup
Created options container on shop page
Created shop index table
Merging feature-shopPage to keep develop up-to-date