Finally fisished cleaning up preference page code.
36 files changed