Updates to shop module as I build the "classic" skin

Working things out as I go.