Mac: More work on Preferences UI.