F42: Change components layouts for better corner coordinates.

Also done in previous commit.