Fixed various Store UI issues