Quick fix shops table
code tidy up
layout tweak