Updates to layout