diff --git a/NAMESPACE b/NAMESPACE
index 7702d5cd..53367776 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -18,6 +18,7 @@ export(characterizationTimeToEventServer)
 export(characterizationTimeToEventViewer)
 export(characterizationViewer)
 export(cohortCountsView)
+export(cohortDefinitionsModule)
 export(cohortDefinitionsView)
 export(cohortDiagCharacterizationView)
 export(cohortDiagnosticsHelperFile)
@@ -51,6 +52,7 @@ export(cohortMethodSystematicErrorViewer)
 export(cohortMethodViewer)
 export(cohortOverlapView)
 export(compareCohortCharacterizationView)
+export(conceptsInDataSourceUi)
 export(conceptsInDataSourceView)
 export(createCdDatabaseDataSource)
 export(createCustomColDefList)
@@ -107,6 +109,7 @@ export(sccsHelperFile)
 export(sccsServer)
 export(sccsView)
 export(timeDistributionsView)
+export(visitContextUi)
 export(visitContextView)
 importFrom(dplyr,"%>%")
 importFrom(rlang,.data)
diff --git a/R/cohort-diagnostics-characterization.R b/R/cohort-diagnostics-characterization.R
index 78cd923b..553b163f 100644
--- a/R/cohort-diagnostics-characterization.R
+++ b/R/cohort-diagnostics-characterization.R
@@ -20,8 +20,9 @@
 #'
 #' @param id    Namespace Id - use namespaced id ns("characterization") inside diagnosticsExplorer module
 #' @export
-cohortDiagCharacterizationView <- function(id) {
+cohortDiagCharacterizationView <- function(id, ...) {
   ns <- shiny::NS(id)
+
   shiny::tagList(
     shinydashboard::box(
       collapsible = TRUE,
@@ -497,17 +498,6 @@ cohortDiagCharacterizationModule <- function(
     selectedDatabaseIds <- shiny::reactive(input$targetDatabase)
     targetCohortId <- shiny::reactive(input$targetCohort)
 
-    getCohortConceptSets <- shiny::reactive({
-      if (!hasData(input$targetCohort) | nrow(dataSource$conceptSets) == 0) {
-        return(NULL)
-      }
-
-      dataSource$conceptSets %>%
-        dplyr::filter(.data$cohortId == input$targetCohort) %>%
-        dplyr::mutate(name = .data$conceptSetName, id = .data$conceptSetId) %>%
-        dplyr::select("id", "name")
-    })
-
     shiny::observe({
       # Default time windows
       selectedTimeWindows <- timeIdOptions %>%
diff --git a/R/cohort-diagnostics-compareCharacterization.R b/R/cohort-diagnostics-compareCharacterization.R
index 59fee63e..624a9cba 100644
--- a/R/cohort-diagnostics-compareCharacterization.R
+++ b/R/cohort-diagnostics-compareCharacterization.R
@@ -247,9 +247,9 @@ plotTemporalCompareStandardizedDifference <- function(balance,
 #' @param id    Namespace Id - use namespaced id ns("compareCohortCharacterization") inside diagnosticsExplorer module
 #' @param title     Optional string title field
 #' @export
-compareCohortCharacterizationView <- function(id, title = "Compare cohort characterization") {
+compareCohortCharacterizationView <- function(id, title = "Compare cohort characterization", ...) {
   ns <- shiny::NS(id)
-
+  print(id)
   shiny::tagList(
     shinydashboard::box(
       collapsible = TRUE,
@@ -811,7 +811,6 @@ compareCohortCharacterizationModule <- function(id,
                                                 domainIdOptions = dataSource$domainIdOptions,
                                                 temporalChoices = dataSource$temporalChoices) {
 
-
   shiny::moduleServer(id, function(input, output, session) {
     # Temporal choices (e.g. -30d - 0d ) are dynamic to execution
     timeIdOptions <- getResultsTemporalTimeRef(dataSource = dataSource) %>%
@@ -933,7 +932,6 @@ compareCohortCharacterizationModule <- function(id,
     shiny::observe({
       characterizationDomainOptionsUniverse <- NULL
       charcterizationDomainOptionsSelected <- NULL
-
       if (hasData(temporalAnalysisRef)) {
         characterizationDomainOptionsUniverse <- domainIdOptions
         charcterizationDomainOptionsSelected <-
diff --git a/R/cohort-diagnostics-definition.R b/R/cohort-diagnostics-definition.R
index db0784c9..93299d5b 100644
--- a/R/cohort-diagnostics-definition.R
+++ b/R/cohort-diagnostics-definition.R
@@ -302,8 +302,9 @@ exportCohortDefinitionsZip <- function(cohortDefinitions,
 #' Outputs cohort definitions
 #' @param id            Namespace id for module
 #' @export
-cohortDefinitionsView <- function(id) {
+cohortDefinitionsView <- function(id, parentId = "DiagnosticsExplorer") {
   ns <- shiny::NS(id)
+
   ui <- shiny::tagList(
     shinydashboard::box(
       width = NULL,
@@ -514,27 +515,25 @@ getCountForConceptIdInCohort <-
 #' Cohort Definition module
 #' @description
 #' cohort defintion conceptsets, json etc
-#'
+#' @export
 #' @param id                            Namespace id
 #' @param dataSource                    DatabaseConnection
-#' @param cohortDefinitions             reactive of cohort definitions to display
 #' @param databaseTable                 data.frame of databasese, databaseId, name
 #' @param cohortTable                   data.frame of cohorts, cohortId, cohortName
 #' @param cohortCountTable              data.frame of cohortCounts, cohortId, subjects records
 cohortDefinitionsModule <- function(
     id,
     dataSource,
-    cohortDefinitions,
     cohortTable = dataSource$cohortTable,
     cohortCountTable = dataSource$cohortCountTable,
-    databaseTable = dataSource$dbTable
+    databaseTable = dataSource$dbTable,
+    ...
 ) {
-  ns <- shiny::NS(id)
 
   cohortDefinitionServer <- function(input, output, session) {
 
     cohortDefinitionTableData <- shiny::reactive(x = {
-      data <- cohortDefinitions() %>%
+      data <- cohortTable %>%
         dplyr::select("cohortId", "cohortName")
       return(data)
     })
diff --git a/R/cohort-diagnostics-incidenceRates.R b/R/cohort-diagnostics-incidenceRates.R
index bae28adb..4f0f46c2 100644
--- a/R/cohort-diagnostics-incidenceRates.R
+++ b/R/cohort-diagnostics-incidenceRates.R
@@ -126,7 +126,7 @@ getIncidenceRateResult <- function(dataSource,
             {@age_group == TRUE} ? {AND ir.age_group != ''} : {  AND ir.age_group = ''}
             {@calendar_year == TRUE} ? {AND ir.calendar_year != ''} : {  AND ir.calendar_year = ''}
               AND ir.person_years > @personYears;"
-  
+
   data <-
     dataSource$connectionHandler$queryDb(
       sql = sql,
@@ -143,16 +143,16 @@ getIncidenceRateResult <- function(dataSource,
       snakeCaseToCamelCase = TRUE
     ) %>%
       tidyr::tibble()
-  
+
   # join with dbTable (moved this outside sql)
   data <- merge(
-    data, 
-    dataSource$dbTable, 
+    data,
+    dataSource$dbTable,
     by = 'databaseId'
-    )
-  
+  )
+
   data <- tidyr::as_tibble(data)
-  
+
   data <- data %>%
     dplyr::mutate(
       gender = dplyr::na_if(.data$gender, ""),
@@ -501,9 +501,10 @@ plotIncidenceRate <- function(data,
 #'
 #' @param id    Namespace Id - use namespaced id ns("incidenceRates") inside diagnosticsExplorer module
 #' @export
-incidenceRatesView <- function(id) {
+incidenceRatesView <- function(id, ...) {
   ns <- shiny::NS(id)
   shiny::tagList(
+
     shinydashboard::box(
       collapsible = TRUE,
       collapsed = TRUE,
@@ -511,6 +512,7 @@ incidenceRatesView <- function(id) {
       width = "100%",
       shiny::htmlTemplate(system.file("cohort-diagnostics-www", "incidenceRate.html", package = utils::packageName()))
     ),
+     shinydashboard::box(cdUiControls(ns, inputPanel = "incidenceRates")),
     shinydashboard::box(
       width = NULL,
       status = "primary",
@@ -1042,7 +1044,7 @@ incidenceRatesModule <- function(id,
       )
     })
 
-  output$selectedCohorts <- shiny::renderUI({ selectionsOutput() })
+    output$selectedCohorts <- shiny::renderUI({ selectionsOutput() })
 
   })
 }
diff --git a/R/cohort-diagnostics-main-ui.R b/R/cohort-diagnostics-main-ui.R
index 2073d382..93711443 100644
--- a/R/cohort-diagnostics-main-ui.R
+++ b/R/cohort-diagnostics-main-ui.R
@@ -14,12 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cdUiControls <- function(ns) {
+cdUiControls <- function(ns, inputPanel) {
   panels <- shiny::tagList(
-    shiny::conditionalPanel(
-      condition = "
-      input.tabs == 'databaseInformation'",
-      ns = ns,
+    if (inputPanel == 'databaseInformation') {
       shinyWidgets::pickerInput(
         inputId = ns("database"),
         label = "Database",
@@ -35,18 +32,10 @@ cdUiControls <- function(ns) {
           virtualScroll = 50
         )
       )
-    ),
-    shiny::conditionalPanel(
-      condition = "input.tabs=='incidenceRates' |
-      input.tabs == 'timeDistribution' |
-      input.tabs == 'cohortCounts' |
-      input.tabs == 'indexEventBreakdown' |
-      input.tabs == 'conceptsInDataSource' |
-      input.tabs == 'orphanConcepts' |
-      input.tabs == 'inclusionRules' |
-      input.tabs == 'visitContext' |
-      input.tabs == 'cohortOverlap'",
-      ns = ns,
+    },
+
+    if (inputPanel %in% c("incidenceRates", 'timeDistribution', 'cohortCounts', 'indexEventBreakdown',
+                          'conceptsInDataSource', 'orphanConcepts', 'inclusionRules', 'visitContext', 'cohortOverlap')) {
       shinyWidgets::pickerInput(
         inputId = ns("databases"),
         label = "Database(s)",
@@ -62,14 +51,8 @@ cdUiControls <- function(ns) {
           virtualScroll = 50
         )
       )
-    ),
-    shiny::conditionalPanel(
-      condition = "
-      input.tabs == 'conceptsInDataSource' |
-      input.tabs == 'orphanConcepts'|
-      input.tabs == 'indexEvents' |
-      input.tabs == 'visitContext'",
-      ns = ns,
+    },
+    if (inputPanel %in% c('conceptsInDataSource', 'orphanConcepts', 'indexEvents', 'visitContext')) {
       shinyWidgets::pickerInput(
         inputId = ns("targetCohort"),
         label = "Cohort",
@@ -85,13 +68,8 @@ cdUiControls <- function(ns) {
           virtualScroll = 50
         )
       )
-    ),
-    shiny::conditionalPanel(
-      condition = "input.tabs == 'cohortCounts' |
-      input.tabs == 'cohortOverlap' |
-      input.tabs == 'incidenceRates' |
-      input.tabs == 'timeDistributions'",
-      ns = ns,
+    },
+    if (inputPanel %in% c('cohortCounts', 'cohortOverlap', 'incidenceRates', 'timeDistributions')) {
       shinyWidgets::pickerInput(
         inputId = ns("cohorts"),
         label = "Cohorts",
@@ -109,12 +87,8 @@ cdUiControls <- function(ns) {
           virtualScroll = 50
         )
       )
-    ),
-    shiny::conditionalPanel(
-      condition = "input.tabs == 'temporalCharacterization' |
-      input.tabs == 'conceptsInDataSource' |
-      input.tabs == 'orphanConcepts'",
-      ns = ns,
+    },
+    if (inputPanel %in% c('temporalCharacterization', 'conceptsInDataSource', 'orphanConcepts')) {
       shinyWidgets::pickerInput(
         inputId = ns("conceptSetsSelected"),
         label = "Concept sets",
@@ -131,7 +105,7 @@ cdUiControls <- function(ns) {
           virtualScroll = 50
         )
       )
-    )
+    }
   )
 
   return(panels)
@@ -170,12 +144,6 @@ cohortDiagnosticsView <- function(id = "DiagnosticsExplorer") {
       title = "Cohort Level Diagnostics",
       width = "100%",
       shiny::fluidRow(
-        shiny::column(
-          shiny::selectInput(inputId = ns("tabs"),
-                             label = "Select Report",
-                             choices = c(), selected = NULL),
-          width = 12
-        ),
         shiny::column(
           cdUiControls(ns),
           width = 12
@@ -250,4 +218,49 @@ cohortDiagnosticsView <- function(id = "DiagnosticsExplorer") {
       )
     )
   )
+}
+
+#' The user interface to the cohort diagnostics viewer module
+#' @param id id
+#' @param parentId parent namespace
+#' @export
+conceptsInDataSourceUi <- function(id, parentId = "DiagnosticsExplorer") {
+  ns <- shiny::NS(id)
+
+  ui <- shiny::fluidPage(
+    shiny::fluidRow(
+      shinydashboard::box(
+        cdUiControls(ns, inputPanel = "conceptsInDataSource"),
+        width = 12
+      )
+    ),
+    shiny::fluidRow(
+      conceptsInDataSourceView(id)
+    )
+  )
+
+  return(ui)
+}
+
+#' The user interface to the cohort diagnostics viewer module
+#' @param id id
+#' @param parentId parent namespace
+#' @export
+visitContextUi <- function(id, parentId = "DiagnosticsExplorer") {
+  ns <- shiny::NS(id)
+  parentNs <- shiny::NS(parentId)
+
+  ui <- shiny::fluidPage(
+    shiny::fluidRow(
+      shinydashboard::box(
+        cdUiControls(parentNs, inputPanel = "visitContext"),
+        width = 12
+      )
+    ),
+    shiny::fluidRow(
+      visitContextView(id)
+    )
+  )
+
+  return(ui)
 }
\ No newline at end of file
diff --git a/R/cohort-diagnostics-main.R b/R/cohort-diagnostics-main.R
index 3bb1d4d9..e080dc85 100644
--- a/R/cohort-diagnostics-main.R
+++ b/R/cohort-diagnostics-main.R
@@ -105,15 +105,15 @@ getEnabledCdReports <- function(dataSource) {
 #'
 #' @export
 createCdDatabaseDataSource <- function(
-    connectionHandler,
-    resultDatabaseSettings,
-    dataModelSpecificationsPath = system.file("cohort-diagnostics-ref",
-                                              "resultsDataModelSpecification.csv",
-                                              package = utils::packageName()),
-    dataMigrationsRef = system.file("cohort-diagnostics-ref",
-                                    "migrations.csv",
-                                    package = utils::packageName()),
-    displayProgress = FALSE
+  connectionHandler,
+  resultDatabaseSettings,
+  dataModelSpecificationsPath = system.file("cohort-diagnostics-ref",
+                                            "resultsDataModelSpecification.csv",
+                                            package = utils::packageName()),
+  dataMigrationsRef = system.file("cohort-diagnostics-ref",
+                                  "migrations.csv",
+                                  package = utils::packageName()),
+  displayProgress = FALSE
 ) {
 
   checkmate::assertR6(connectionHandler, "ConnectionHandler")
@@ -271,19 +271,19 @@ createCdDatabaseDataSource <- function(
 
 # SO much of the app requires this table in memory - it would be much better to re-write queries to not need it!
 getDatabaseTable <- function(dataSource) {
-  
+
   # hot fix
-  if(tolower(paste0(dataSource$databaseTablePrefix, dataSource$databaseTable)) == 'database_meta_data'){
+  if (tolower(paste0(dataSource$databaseTablePrefix, dataSource$databaseTable)) == 'database_meta_data') {
     databaseTable <- dataSource$connectionHandler$queryDb(
       "SELECT *, cdm_source_abbreviation as database_name FROM @schema.@table_name",
       schema = dataSource$schema,
       table_name = paste0(dataSource$databaseTablePrefix, dataSource$databaseTable)
     ) # end hot fix
-  } else{
-  databaseTable <- loadResultsTable(
-    dataSource = dataSource, 
-    tableName = paste0(dataSource$databaseTablePrefix, dataSource$databaseTable), 
-    required = TRUE
+  } else {
+    databaseTable <- loadResultsTable(
+      dataSource = dataSource,
+      tableName = paste0(dataSource$databaseTablePrefix, dataSource$databaseTable),
+      required = TRUE
     )
   }
 
@@ -301,21 +301,21 @@ getDatabaseTable <- function(dataSource) {
 # SO much of the app requires this table in memory - it would be much better to re-write queries to not need it!
 getCohortTable <- function(dataSource) {
   if (tableIsEmpty(
-      dataSource = dataSource, 
-      tableName = paste0(dataSource$cgTablePrefix, dataSource$cgTable)
-    )
-    ) {
+    dataSource = dataSource,
+    tableName = paste0(dataSource$cgTablePrefix, dataSource$cgTable)
+  )
+  ) {
     return(data.frame())
   }
   # hot fix
-  if(paste0(dataSource$cgTablePrefix, dataSource$cgTable) == 'cg_cohort_definition'){
+  if (paste0(dataSource$cgTablePrefix, dataSource$cgTable) == 'cg_cohort_definition') {
     cohortTable <- dataSource$connectionHandler$queryDb(
       "SELECT cohort_definition_id as cohort_id, cohort_name FROM @schema.@table_name",
       schema = dataSource$schema,
       table_name = paste0(dataSource$cgTablePrefix, dataSource$cgTable)
     )
-   # end hot fix
-  } else{
+    # end hot fix
+  } else {
     cohortTable <- dataSource$connectionHandler$queryDb(
       "SELECT cohort_id, cohort_name FROM @schema.@table_name",
       schema = dataSource$schema,
@@ -407,10 +407,9 @@ getResultsTemporalTimeRef <- function(dataSource) {
 #' @param dataSource                    dataSource optionally created with createCdDatabaseDataSource
 #' @export
 cohortDiagnosticsServer <- function(id,
-                                   connectionHandler,
-                                   resultDatabaseSettings,
-                                   dataSource = NULL) {
-  ns <- shiny::NS(id)
+                                    connectionHandler,
+                                    resultDatabaseSettings,
+                                    dataSource = NULL) {
 
   checkmate::assertClass(dataSource, "CdDataSource", null.ok = TRUE)
   if (is.null(dataSource)) {
@@ -419,71 +418,17 @@ cohortDiagnosticsServer <- function(id,
       createCdDatabaseDataSource(
         connectionHandler = connectionHandler,
         resultDatabaseSettings = resultDatabaseSettings,
-        #schema = resultDatabaseSettings$schema,
-        #vocabularyDatabaseSchema = resultDatabaseSettings$vocabularyDatabaseSchema, # is this in results?
-        #cdTablePrefix = resultDatabaseSettings$cdTablePrefix,
-        #cgTableName = resultDatabaseSettings$cgTable, # different for CD?
-        #databaseTableName = paste0(resultDatabaseSettings$databaseTablePrefix,resultDatabaseSettings$databaseTable),
         displayProgress = TRUE
       )
   }
-
   shiny::moduleServer(id, function(input, output, session) {
     databaseTable <- dataSource$dbTable
     cohortTable <- dataSource$cohortTable
     conceptSets <- dataSource$conceptSets
     cohortCountTable <- dataSource$cohortCountTable
-    enabledReports <- dataSource$enabledReports
     temporalChoices <- dataSource$temporalChoices
     temporalCharacterizationTimeIdChoices <- dataSource$temporalCharacterizationTimeIdChoices
 
-    shiny::observe({
-
-      selection <- c(
-        "Cohort Definitions" = "cohortDefinitions",
-        "Database Information" = "databaseInformation"
-      )
-      if ("cohortCount" %in% dataSource$enabledReports)
-        selection["Cohort Counts"] <- "cohortCounts"
-
-      if ("indexEvents" %in% dataSource$enabledReports)
-        selection["Index Events"] <- "indexEvents"
-
-      if ("temporalCovariateValue" %in% dataSource$enabledReports) {
-        selection["Cohort Characterization"] <- "characterization"
-        selection["Compare Cohort Characterization"] <- "compareCohortCharacterization"
-        selection["Time Distributions"] <- "timeDistribution"
-      }
-
-      if ("relationship" %in% dataSource$enabledReports)
-        selection["Cohort Overlap"] <- "cohortOverlap"
-
-      if ("cohortInclusion" %in% dataSource$enabledReports)
-        selection["Inclusion Rule Statistics"] <- "inclusionRules"
-
-      if ("incidenceRate" %in% dataSource$enabledReports)
-        selection["Incidence"] <- "incidenceRates"
-
-      if ("visitContext" %in% dataSource$enabledReports)
-        selection["Visit Context"] <- "visitContext"
-
-      if ("includedSourceConcept" %in% dataSource$enabledReports)
-        selection["Concepts In Data Source"] <- "conceptsInDataSource"
-
-      if ("orphanConcepts" %in% dataSource$enabledReports)
-        selection["Orphan Concepts"] <- "orphanConcepts"
-
-      if ("indexEventBreakdown" %in% dataSource$enabledReports)
-        selection["Index Event Breakdown"] <- "indexEventBreakdown"
-
-      shiny::updateSelectInput(
-        inputId = "tabs",
-        label = "Select Report",
-        choices = selection,
-        selected = c("cohortDefinitions")
-      )
-    })
-
     # Reacive: targetCohortId
     targetCohortId <- shiny::reactive({
       return(cohortTable$cohortId[cohortTable$compoundName == input$targetCohort])
@@ -631,112 +576,19 @@ cohortDiagnosticsServer <- function(id,
       return(input$targetCohort)
     })
 
-    if ("cohort" %in% enabledReports) {
-      cohortDefinitionsModule(id = "cohortDefinitions",
-                              dataSource = dataSource,
-                              cohortDefinitions = cohortSubset)
-    }
-
-    if ("includedSourceConcept" %in% enabledReports) {
-      conceptsInDataSourceModule(id = "conceptsInDataSource",
-                                 dataSource = dataSource,
-                                 selectedCohort = selectedCohort,
-                                 selectedDatabaseIds = selectedDatabaseIds,
-                                 targetCohortId = targetCohortId,
-                                 selectedConceptSets = selectedConceptSets,
-                                 databaseTable = databaseTable)
-    }
-
-    if ("orphanConcept" %in% enabledReports) {
-      orphanConceptsModule("orphanConcepts",
-                           dataSource = dataSource,
-                           databaseTable = databaseTable,
-                           selectedCohort = selectedCohort,
-                           selectedDatabaseIds = selectedDatabaseIds,
-                           targetCohortId = targetCohortId,
-                           selectedConceptSets = selectedConceptSets,
-                           conceptSetIds = conceptSetIds)
-    }
-
-    if ("cohortCount" %in% enabledReports) {
-      cohortCountsModule(id = "cohortCounts",
-                         dataSource = dataSource,
-                         cohortTable = cohortTable, # The injection of tables like this should be removed
-                         databaseTable = databaseTable, # The injection of tables like this should be removed
-                         selectedCohorts = selectedCohorts,
-                         selectedDatabaseIds = selectedDatabaseIds,
-                         cohortIds = cohortIds)
-    }
-
-    if ("indexEventBreakdown" %in% enabledReports) {
-      indexEventBreakdownModule("indexEvents",
-                                dataSource = dataSource,
-                                selectedCohort = selectedCohort,
-                                targetCohortId = targetCohortId,
-                                cohortCountTable = cohortCountTable,
-                                selectedDatabaseIds = selectedDatabaseIds)
-    }
-
-    if ("visitContext" %in% enabledReports) {
-      visitContextModule(id = "visitContext",
-                         dataSource = dataSource,
-                         selectedCohort = selectedCohort,
-                         selectedDatabaseIds = selectedDatabaseIds,
-                         targetCohortId = targetCohortId,
-                         cohortCountTable = cohortCountTable,
-                         databaseTable = databaseTable)
-    }
-
-    if ("relationship" %in% enabledReports) {
-      cohortOverlapModule(id = "cohortOverlap",
-                          dataSource = dataSource,
-                          selectedCohorts = selectedCohorts,
-                          selectedDatabaseIds = selectedDatabaseIds,
-                          targetCohortId = targetCohortId,
-                          cohortIds = cohortIds,
-                          cohortTable = cohortTable)
-    }
-
-    if ("temporalCovariateValue" %in% enabledReports) {
-      timeDistributionsModule(id = "timeDistributions",
-                              dataSource = dataSource,
-                              selectedCohorts = selectedCohorts,
-                              cohortIds = cohortIds,
-                              selectedDatabaseIds = selectedDatabaseIds)
-
-      cohortDiagCharacterizationModule(id = "characterization",
-                             dataSource = dataSource)
-
-      compareCohortCharacterizationModule(id = "compareCohortCharacterization",
-                                          dataSource = dataSource)
-    }
-
-    if ("incidenceRate" %in% enabledReports) {
-      incidenceRatesModule(id = "incidenceRates",
-                           dataSource = dataSource,
-                           selectedCohorts = selectedCohorts,
-                           cohortIds = cohortIds,
-                           selectedDatabaseIds = selectedDatabaseIds,
-                           databaseTable = databaseTable,
-                           cohortTable = cohortTable)
-    }
-
-    if ("cohortInclusion" %in% enabledReports) {
-      inclusionRulesModule(id = "inclusionRules",
-                           dataSource = dataSource,
-                           databaseTable = databaseTable,
-                           selectedCohort = selectedCohort,
-                           targetCohortId = targetCohortId,
-                           selectedDatabaseIds = selectedDatabaseIds)
-
-    }
-    databaseInformationModule(id = "databaseInformation",
-                              dataSource = dataSource,
-                              selectedDatabaseIds = selectedDatabaseIds,
-                              databaseTable = databaseTable)
-
-  }
+    globalStateVars <- shiny::reactiveValues(
+      cohortIds = cohortIds(),
+      targetCohortId = targetCohortId(),
+      selectedCohort = selectedCohort(),
+      selectedCohorts = selectedCohorts(),
+      cohortDefinitions = cohortSubset(),
+      selectedTemporalTimeIds = selectedTemporalTimeIds(),
+      selectedDatabaseIds = selectedDatabaseIds(),
+      conceptSetIds = conceptSetIds(),
+      selectedConceptSets = selectedConceptSets()
+    )
 
-  )
+    return(globalStateVars)
+  })
 
 }
diff --git a/man/cohortDefinitionsModule.Rd b/man/cohortDefinitionsModule.Rd
index 87a60709..71a3c93f 100644
--- a/man/cohortDefinitionsModule.Rd
+++ b/man/cohortDefinitionsModule.Rd
@@ -7,7 +7,6 @@
 cohortDefinitionsModule(
   id,
   dataSource,
-  cohortDefinitions,
   cohortTable = dataSource$cohortTable,
   cohortCountTable = dataSource$cohortCountTable,
   databaseTable = dataSource$dbTable
@@ -18,8 +17,6 @@ cohortDefinitionsModule(
 
 \item{dataSource}{DatabaseConnection}
 
-\item{cohortDefinitions}{reactive of cohort definitions to display}
-
 \item{cohortTable}{data.frame of cohorts, cohortId, cohortName}
 
 \item{cohortCountTable}{data.frame of cohortCounts, cohortId, subjects records}
diff --git a/man/cohortDefinitionsView.Rd b/man/cohortDefinitionsView.Rd
index 44c6eb84..2f5095e1 100644
--- a/man/cohortDefinitionsView.Rd
+++ b/man/cohortDefinitionsView.Rd
@@ -4,7 +4,7 @@
 \alias{cohortDefinitionsView}
 \title{Cohort Definitions View}
 \usage{
-cohortDefinitionsView(id)
+cohortDefinitionsView(id, parentId = "DiagnosticsExplorer")
 }
 \arguments{
 \item{id}{Namespace id for module}
diff --git a/man/cohortDiagCharacterizationView.Rd b/man/cohortDiagCharacterizationView.Rd
index 171c47b1..424cfc9b 100644
--- a/man/cohortDiagCharacterizationView.Rd
+++ b/man/cohortDiagCharacterizationView.Rd
@@ -4,7 +4,7 @@
 \alias{cohortDiagCharacterizationView}
 \title{characterization}
 \usage{
-cohortDiagCharacterizationView(id)
+cohortDiagCharacterizationView(id, ...)
 }
 \arguments{
 \item{id}{Namespace Id - use namespaced id ns("characterization") inside diagnosticsExplorer module}
diff --git a/man/compareCohortCharacterizationView.Rd b/man/compareCohortCharacterizationView.Rd
index eba1e958..59a1a448 100644
--- a/man/compareCohortCharacterizationView.Rd
+++ b/man/compareCohortCharacterizationView.Rd
@@ -6,7 +6,8 @@
 \usage{
 compareCohortCharacterizationView(
   id,
-  title = "Compare cohort characterization"
+  title = "Compare cohort characterization",
+  ...
 )
 }
 \arguments{
diff --git a/man/incidenceRatesView.Rd b/man/incidenceRatesView.Rd
index 6cd4c74e..7c74cb3d 100644
--- a/man/incidenceRatesView.Rd
+++ b/man/incidenceRatesView.Rd
@@ -4,7 +4,7 @@
 \alias{incidenceRatesView}
 \title{incidence Rates View}
 \usage{
-incidenceRatesView(id)
+incidenceRatesView(id, ...)
 }
 \arguments{
 \item{id}{Namespace Id - use namespaced id ns("incidenceRates") inside diagnosticsExplorer module}