Another big chunk of changes to options pages.