The two General preference pages look like they need to be combined, the first contains all of the pages that hang off General and the second General contains what is normally viewed when you click on "General"

To see what I mean:

1) Launch Desktop Client
2) Go to Window > Preferences

General is listed twice.