Further updates to the new layout.