[REF] Misc typo and try to reuse shop min/more design + see comment in github