Make layout a bit more resilient
Add optional build information to squares