Basic changes to support new layout