updates to merchant and inventory system display
more template rewrites
finalizing template refactor for inventory/store display
fix minor error