Incorporate layout, DRY