improved shop and fixed logout bug