Layout improvements for examles.
Update for expanders.