Shopping Mode improvements