Fix two category names

Apple has renamed Mac OS X to OS X.
Add a 'System' entry to the popup.

Makes it easier to find system version & build (when relevant) or file OS bugs.