Shop layout recommendations?

The 11th pic how it look after constriction .