More work on the new options menu.