Updates to overall layout