Reordered the menu and re-enabled code to put the icon in the notification bar
    on startup if the preference for it is enabled.