A little more on layout.

 

I'm putting this here so you can consider the fields. Maybe we will come back to it ?