[2.3] - Better west region state management

This brings a "better" state management for the layout (mostly aimed at the west region).

Adding some comments on the diff