reworked the store location forms a bit