Refactored the layout constructs.