changes to layout docs; some TODO