Updates to layout 2