Clean up shop layout