Fixed all store navigation