Update to reflect new layout