chore: #847 layout changes in all 3 toplevels