     map.addScreenState(SettingsScreen) { screenState in
         let table = app.tables.element(boundBy: 0)
 
-        screenState.tap(table.cells["Sync"], to: SyncSettings)
+        screenState.tap(table.cells["Sync"], to: SyncSettings, if: "fxaUsername != nil")
         screenState.tap(table.cells["Search"], to: SearchSettings)
         screenState.tap(table.cells["NewTab"], to: NewTabSettings)
         screenState.tap(table.cells["Homepage"], to: HomePageSettings)
         screenState.tap(table.cells["OpenWith.Setting"], to: OpenWithSettings)
-        screenState.swipeUp(table, to: SettingsScreen2)
-
-        screenState.backAction = navigationControllerBackAction
-    }
-
-    map.addScreenState(SettingsScreen2) { screenState in
-        let table = app.tables.element(boundBy: 0)
-        screenState.swipeDown(table, to: SettingsScreen)
-
         screenState.tap(table.cells["TouchIDPasscode"], to: PasscodeSettings)
         screenState.tap(table.cells["Logins"], to: LoginsSettings)
         screenState.tap(table.cells["ClearPrivateData"], to: ClearPrivateDataSettings)
-
         screenState.tap(table.cells["TrackingProtection"], to: TrackingProtectionSettings)
         screenState.tap(table.cells["ShowTour"], to: ShowTourInSettings)
+
+        screenState.backAction = navigationControllerBackAction
     }
 
     map.addScreenState(SearchSettings) { screenState in

    var nightMode = false

    var pocketInNewTab = false
}

fileprivate let defaultURL = "https://www.mozilla.org/en-US/book/"


    // Some internally useful screen states.
    let WebPageLoading = "WebPageLoading"

    map.addScreenState(NewTabScreen) { screenState in
        screenState.noop(to: HomePanelsScreen)
