Updates to make layout dependent on yaml