Updates for new layout.