Internal and external windows now both use the layout.