Working with the new layout.