Layout changes
Merge branch 'master' of github.com:jamiebclark/Shop
Updated Layout. Updated forms to reflect updates in Layout Plugin