Shop layout changes

And update item lists to always be
item (option)