Layout fixes
Merge remote-tracking branch 'upstream/main' into main