responsive stuff for stores
fixed merge conflicts