Cleaning up preference pages.
91 files changed