Updates to layout for consumption