Fix highlighting of the selected row.

The additional header row made that necessary.
Call correct super method in onPrepareOptionsMenu.

This causes weird menus from time to time.