Fixing store's front-end2