Standardize on window child layout.

This will make each child compatible with ErrorMessage and more
consistent generally.