Working on the shop

Minor layout fixes/changes