First preference simplification step 

I have created a new settings menu and broken out a few items from preferences that is a better fit in the menu. I think that this is a good point to merge into next to avoid further merge conflicts.
The next step will be to break up the Preferences dialog in several parts.