Switch to new standard layout.