Fix onlayouts, clean up docs

[Delivers #84148754]