Small changes leading up to separated options pages.