diff --git a/DESCRIPTION b/DESCRIPTION
index c2c91158fb..a08465d30d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -55,7 +55,7 @@ Imports:
     stats,
     teal.code (>= 0.6.1),
     teal.logger (>= 0.4.0),
-    teal.reporter (>= 0.4.0.9004),
+    teal.reporter (>= 0.4.0.9005),
     teal.widgets (>= 0.4.3.9001),
     tools,
     utils
diff --git a/NAMESPACE b/NAMESPACE
index 514221adf7..a9563f1a8d 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,19 +1,17 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(.srv_teal_module,default)
+S3method(.srv_teal_module,teal_module)
+S3method(.srv_teal_module,teal_modules)
+S3method(.ui_teal_module,default)
+S3method(.ui_teal_module,teal_module)
+S3method(.ui_teal_module,teal_modules)
 S3method(c,teal_slices)
 S3method(format,teal_module)
 S3method(format,teal_modules)
 S3method(join_keys,tdata)
 S3method(print,teal_module)
 S3method(print,teal_modules)
-S3method(srv_teal_module,default)
-S3method(srv_teal_module,teal_module)
-S3method(srv_teal_module,teal_modules)
-S3method(ui_teal_module,default)
-S3method(ui_teal_module,teal_module)
-S3method(ui_teal_module,teal_modules)
-S3method(ui_teal_modules_nav_dropdown,teal_module)
-S3method(ui_teal_modules_nav_dropdown,teal_modules)
 S3method(within,teal_data_module)
 export(TealReportCard)
 export(add_landing_modal)
diff --git a/NEWS.md b/NEWS.md
index f1f8f6f54b..e1c7b4c1e7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,20 @@
 # teal 0.16.0.9015
 
+### Breaking changes
+
+* The `reporter_previewer_module()` is deprecated and will be removed in the future release. The custom `server_args` values can be set using `options()`:
+    - `teal.reporter.nav_buttons` to control which buttons will be displayed in the "Report" drop-down.
+    - `teal.reporter.rmd_outputs` to customize the R Markdown outputs types for the report.
+    - `teal.reporter.rmd_yaml_args` to customize the widget inputs in the download report modal.
+    - `teal.reporter.knitr_global` to customize the global `knitr` options for the report.
+
+### Enhancement
+
+* General repositioning of key navigation components across the app:
+    - Modules: The module navigation is moved from a nested tab selection to a "Module" drop-down selection. The module selection can be done from the nested button of modules.
+    - Reporter: The Report previewer is no longer displayed as yet another teal module, it is placed inside a "Report" drop-down right next to the "Module" drop-down. The Report previewer is a modal that displays the added report cards. The "Report" drop-down also contains other global report options like download/load/reset the Report.
+    - Teal Data Module: The UI created by the `teal_data_module()` is now placed inside a modal that can only be closed when it returns `teal_data`.
+
 # teal 0.16.0
 
 ### New features
diff --git a/R/init.R b/R/init.R
index 55f32501ff..5df6505c94 100644
--- a/R/init.R
+++ b/R/init.R
@@ -204,6 +204,8 @@ init <- function(data,
     list(
       ui = function(request) {
         bslib::page_fluid(
+          theme = get_teal_bs_theme(),
+          style = "--bs-gutter-x: 0;",
           title = tags$div(
             id = "teal-app-title",
             tags$head(
@@ -217,6 +219,7 @@ init <- function(data,
           ),
           tags$header(
             id = "teal-header",
+            style = "margin: 0.5em",
             tags$div(id = "teal-header-content")
           ),
           ui_teal(
@@ -225,6 +228,7 @@ init <- function(data,
           ),
           tags$footer(
             id = "teal-footer",
+            style = "margin: 0.5em",
             tags$div(id = "teal-footer-content"),
             ui_session_info("teal-footer-session_info")
           )
diff --git a/R/module_bookmark_manager.R b/R/module_bookmark_manager.R
index 80cddf93ef..e76511eb0d 100644
--- a/R/module_bookmark_manager.R
+++ b/R/module_bookmark_manager.R
@@ -50,21 +50,11 @@ ui_bookmark_panel <- function(id, modules) {
   is_unbookmarkable <- need_bookmarking(modules)
   shinyOptions(bookmarkStore = bookmark_option)
 
-  # Render bookmark warnings count
   if (!all(is_unbookmarkable) && identical(bookmark_option, "server")) {
-    tags$button(
+    .expand_button(
       id = ns("do_bookmark"),
-      class = "btn action-button wunder_bar_button bookmark_manager_button",
-      title = "Add bookmark",
-      tags$span(
-        suppressMessages(icon("fas fa-bookmark")),
-        if (any(is_unbookmarkable)) {
-          tags$span(
-            sum(is_unbookmarkable),
-            class = "badge-warning badge-count text-white bg-danger"
-          )
-        }
-      )
+      label = "Bookmark",
+      icon = "bookmark-fill"
     )
   }
 }
@@ -136,7 +126,8 @@ srv_bookmark_panel <- function(id, modules) {
             id = ns("bookmark_modal"),
             title = "Bookmarked teal app url",
             modal_content,
-            easyClose = TRUE
+            easyClose = TRUE,
+            footer = NULL
           )
         )
       )
diff --git a/R/module_data_summary.R b/R/module_data_summary.R
index c06a51b44d..b204f0e7fb 100644
--- a/R/module_data_summary.R
+++ b/R/module_data_summary.R
@@ -12,7 +12,7 @@
 #' Module includes also "Show/Hide unsupported" button to toggle rows of the summary table
 #' containing datasets where number of observations are not calculated.
 #'
-#' @inheritParams module_teal_modules_nav
+#' @inheritParams module_teal_module
 #'
 #' @name module_data_summary
 #' @rdname module_data_summary
diff --git a/R/module_filter_data.R b/R/module_filter_data.R
index 509fb702fd..f5b84e1060 100644
--- a/R/module_filter_data.R
+++ b/R/module_filter_data.R
@@ -11,7 +11,7 @@
 #'  - tab is selected (`is_active`)
 #'  - when filters are changed (`get_filter_expr` is different than previous)
 #'
-#' @inheritParams module_teal_modules_nav
+#' @inheritParams module_teal_module
 #' @param active_datanames (`reactive` returning `character`) this module's data names
 #' @name module_filter_data
 #' @keywords internal
diff --git a/R/module_filter_manager.R b/R/module_filter_manager.R
index 26f1373ec4..6c1e4fa869 100644
--- a/R/module_filter_manager.R
+++ b/R/module_filter_manager.R
@@ -54,11 +54,10 @@ NULL
 #' @rdname module_filter_manager
 ui_filter_manager_panel <- function(id) {
   ns <- NS(id)
-  tags$button(
+  .expand_button(
     id = ns("show_filter_manager"),
-    class = "btn action-button wunder_bar_button",
-    title = "View filter mapping",
-    suppressMessages(icon("fas fa-grip"))
+    label = "Filter Manager",
+    icon = "funnel-fill"
   )
 }
 
diff --git a/R/module_nested_tabs.R b/R/module_nested_tabs.R
index 05ae8f74ae..5ecf07dbb9 100644
--- a/R/module_nested_tabs.R
+++ b/R/module_nested_tabs.R
@@ -1,32 +1,24 @@
 #' Calls all `modules`
 #'
-#' Module calls `modules` with `id` according to their location in the tree. There are multiple modules
-#' managing this process:
-#' - `ui/srv_teal_modules_nav` container module where `input$active_module_id` exists.
-#' - `ui_teal_modules_nav_dropdown` creates drop-down menu to select active module.
-#' - `ui/srv_teal_module` creates tab containers for each module. Only one module is visible at the time as a result
-#'   of selecting in `ui_teal_modules_nav_dropdown`.
+#' Modules create navigation bar with drop-down menu and tab content. Each `teal_module` is called recursively
+#' according to the structure of `modules` argument. This is a custom module which utilizes shiny/Bootstrap
+#' `.nav` class. `modules` are called with an `id` derived from `teal_module`'s label and labels of its
+#' ancestors (if any).
 #'
-#' ### UI
+#' ### Functions
 #'
-#' On the UI side, a drop-down is created that lists buttons labeled with the labels of all `teal_module`s.
-#' The buttons in the drop-down are grouped according to their respective groups.
-#' These UI components are created in a way to utilize navigation-bar functionality of shiny.
-#' To achieve this, the buttons need to be placed inside a `<ul class = "nav shiny-tab-input">`.
-#' 1. Each module button has following attributes:
-#'   - `href = "#<teal_module container id>"` links button with the container of the specific `teal_module`
-#'   - `data-bs-toggle = "tab"` tells Bootstrap to hide or show `teal_module`'s content
-#'   - `data-value = "<teal_module$path>"` This attribute is taken by shiny from all buttons of class "active"
-#'     and used as `input$active_module_id` in the namespace of [srv_teal_modules_nav()].
-#' 2. Each module content is wrapped in a container with the `class = "tab-pane"` with a unique `id`.
-#' This tells Bootstrap library that clicking a button should toggle relevant "tab"
-#' with an `id` matching button's `href` attribute.
+#' - `ui/srv_teal_module` - wrapper module which links drop-down buttons with modules panels.
+#'   Here `input$active_module_id` is instantiated.
+#' - `.ui/srv_teal_module` - recursive S3 method which calls each module
+#' - `.teal_navbar_append` - wrapper for [htmltools::tagAppendChild()] to add any element to navigation bar.
+#' - `.teal_navbar_insert_ui` - wrapper for [shiny::insertUI()] to insert any element to navigation bar.
+#' - `.teal_navbar_menu` - UI function to create a drop-down menu for navigation bar.
 #'
-#' ### Server
+#' ### Utilizing `.nav` class
 #'
-#'  On the server side, `teal_module`(s) are called with `id` respective to their label and group.
-#' `input$active_module_id` determines which module is currently active and only this module
-#'  observes reactive changes.
+#' No extra `javascript` or server functionality were introduced to have navigation buttons toggle between
+#' tab panels. This works thanks to `.nav` container which links `.nav-link` buttons `href = #<module id>`
+#' attribute with `.tab-pane`'s `id = <module id>` (see ``.ui_teal_module.teal_module`).
 #'
 #' ### Initialization and isolation of the `teal_module`(s)
 #'
@@ -36,7 +28,7 @@
 #' one can run at any given time. This makes the app more efficient by reducing unnecessary
 #' computations on server side.
 #'
-#' @name module_teal_modules_nav
+#' @name module_teal_module
 #'
 #' @inheritParams module_teal
 #'
@@ -49,6 +41,9 @@
 #'  When `datasets` is passed from the parent module (`srv_teal`) then `dataset` is a singleton
 #'  which implies the filter-panel to be "global". When `NULL` then filter-panel is "module-specific".
 #'
+#' @param reporter (`Reporter`, singleton)
+#'  Stores reporter-cards appended in the server of `teal_module`.
+#'
 #' @param data_load_status (`reactive` returning `character(1)`)
 #'  Determines action dependent on a data loading status:
 #'  - `"ok"` when `teal_data` is returned from the data loading.
@@ -62,20 +57,22 @@
 #' @return
 #' Output of currently active module.
 #' - `srv_teal_module.teal_module` returns `reactiveVal` containing output of the called module.
-#' - `srv_teal_module.teal_modules` returns output of module selected by drop-down.
-#' - `srv_teal_modules_nav` bypasses output of `srv_teal_module.teal_modules`.
+#' - `srv_teal_module.teal_modules` returns output of modules in a list following the hierarchy of `modules`
 #'
 #' @keywords internal
 NULL
 
-ui_teal_modules_nav <- function(id, modules) {
+
+#' @rdname module_teal_module
+ui_teal_module <- function(id, modules) {
   ns <- NS(id)
   active_module_id <- restoreInput(
     ns("active_module_id"),
     unlist(modules_slot(modules, "path"), use.names = FALSE)[1]
   )
-  nav_buttons <- ui_teal_modules_nav_dropdown(id = ns("nav"), modules = modules, active_module_id)
-  tab_content <- ui_teal_module(id = ns("nav"), modules = modules, active_module_id = active_module_id)
+
+  module_items <- .ui_teal_module(id = ns("nav"), modules = modules, active_module_id = active_module_id)
+
   tags$div(
     class = "teal-modules-wrapper",
     htmltools::htmlDependency(
@@ -83,45 +80,35 @@ ui_teal_modules_nav <- function(id, modules) {
       version = utils::packageVersion("teal"),
       package = "teal",
       src = "module-navigation",
-      stylesheet = "module-navigation.css",
-      script = "module-navigation.js"
+      stylesheet = "module-navigation.css"
     ),
     tags$ul(
       id = ns("active_module_id"),
-      style = "align-items: center;",
-      class = "nav shiny-tab-input", # to mimic nav and mimic tabsetPanel
+      style = "align-items: center; gap: 1em; font-size: large;",
+      class = "teal-navbar nav shiny-tab-input", # to mimic nav and mimic tabsetPanel
       `data-tabsetid` = "test",
-      tags$div(
-        class = "dropdown nav-item-custom",
-        onmouseover = "initNavigationMouseOver.call(this)",
-        onmouseout = "initNavigationMouseOut.call(this)",
-        tags$a(
-          class = "dropdown-toggle active",
-          role = "button",
-          style = "text-decoration: none; border-bottom-color: #0d6efd;",
-          "Modules"
-        ),
-        tags$div(
-          class = "dropdown-menu",
-          tags$ul(class = "teal-modules-tree", !!!nav_buttons)
-        )
+      .teal_navbar_menu(
+        !!!module_items$link,
+        label = sprintf("Module (%d)", length(unlist(modules_slot(modules, "label")))),
+        class = "teal-modules-tree",
+        icon = "diagram-3-fill"
       )
     ),
-    tags$div(class = "tab-content", !!!tab_content)
+    tags$div(class = "tab-content", module_items$tab_pane)
   )
 }
 
-#' @rdname module_teal_modules_nav
-srv_teal_modules_nav <- function(id,
-                                 data,
-                                 modules,
-                                 datasets = NULL,
-                                 slices_global,
-                                 reporter = teal.reporter::Reporter$new(),
-                                 data_load_status = reactive("ok")) {
+#' @rdname module_teal_module
+srv_teal_module <- function(id,
+                            data,
+                            modules,
+                            datasets = NULL,
+                            slices_global,
+                            reporter = teal.reporter::Reporter$new(),
+                            data_load_status = reactive("ok")) {
   moduleServer(id, function(input, output, session) {
-    srv_teal_module(
-      "nav",
+    .srv_teal_module(
+      id = "nav",
       data = data,
       modules = modules,
       datasets = datasets,
@@ -133,77 +120,72 @@ srv_teal_modules_nav <- function(id,
   })
 }
 
-#' @rdname module_teal_modules_nav
-ui_teal_modules_nav_dropdown <- function(id, modules, active_module_id) {
-  UseMethod("ui_teal_modules_nav_dropdown", modules)
+#' @rdname module_teal_module
+.teal_navbar_append <- function(navbar, child) {
+  tagAppendChild(tag = navbar, child = child, .cssSelector = ".teal-navbar")
 }
 
-#' @rdname module_teal_modules_nav
-#' @export
-ui_teal_modules_nav_dropdown.teal_modules <- function(id, modules, active_module_id) {
-  ns <- NS(id)
-  tagList(
-    if (length(modules$label)) tags$li(tags$span(modules$label, class = "module-group-label")),
-    tags$li(
-      tags$ul(
-        mapply(
-          ui_teal_modules_nav_dropdown,
-          id = ns(.label_to_id(sapply(modules$children, `[[`, "label"))),
-          modules = modules$children,
-          active_module_id = active_module_id,
-          SIMPLIFY = FALSE
-        )
-      )
-    )
+#' @rdname module_teal_module
+.teal_navbar_insert_ui <- function(ui, where = "afterBegin", session = getDefaultReactiveDomain()) {
+  insertUI(
+    selector = ".teal-navbar",
+    where = where,
+    ui = ui,
+    session = session
   )
 }
 
-#' @rdname module_teal_modules_nav
-#' @export
-ui_teal_modules_nav_dropdown.teal_module <- function(id, modules, active_module_id) {
-  ns <- NS(id)
-  module_id <- modules$path
-  tags$li(
-    tags$a(
-      href = paste0("#", ns("wrapper")), # links button with module content in `tab-content` with same id.
-      `data-bs-toggle` = "tab", # signals shiny to treat this element as bootstrap tab buttons for toggle.
-      `data-value` = module_id, # this links module-content with this button.
-      class = c("nav-link", "module-button", "btn-default", if (identical(module_id, active_module_id)) "active"),
-      # `nav-link` is required to mimic bslib tab panel.
-      modules$label
+#' @rdname module_teal_module
+.teal_navbar_menu <- function(..., id = NULL, label = NULL, class = NULL, icon = NULL) {
+  tags$div(
+    class = "dropdown nav-item-custom",
+    .dropdown_button(
+      id = id,
+      label = label,
+      icon = icon
+    ),
+    tags$div(
+      class = "dropdown-menu",
+      tags$ul(class = class, !!!rlang::list2(...))
     )
   )
 }
 
-#' @rdname module_teal_modules_nav
-ui_teal_module <- function(id, modules, active_module_id) {
+#' @rdname module_teal_module
+.ui_teal_module <- function(id, modules, active_module_id) {
   checkmate::assert_multi_class(modules, c("teal_modules", "teal_module", "shiny.tag"))
-  UseMethod("ui_teal_module", modules)
+  UseMethod(".ui_teal_module", modules)
 }
 
-#' @rdname module_teal_modules_nav
+#' @rdname module_teal_module
 #' @export
-ui_teal_module.default <- function(id, modules, active_module_id) {
+.ui_teal_module.default <- function(id, modules, active_module_id) {
   stop("Modules class not supported: ", paste(class(modules), collapse = " "))
 }
 
-#' @rdname module_teal_modules_nav
+#' @rdname module_teal_module
 #' @export
-ui_teal_module.teal_modules <- function(id, modules, active_module_id) {
-  tagList(
-    mapply(
-      FUN = ui_teal_module,
-      id = NS(id, .label_to_id(sapply(modules$children, `[[`, "label"))),
-      modules = modules$children,
-      active_module_id = active_module_id,
-      SIMPLIFY = FALSE
-    )
+.ui_teal_module.teal_modules <- function(id, modules, active_module_id) {
+  items <- mapply(
+    FUN = .ui_teal_module,
+    id = NS(id, .label_to_id(sapply(modules$children, `[[`, "label"))),
+    modules = modules$children,
+    active_module_id = active_module_id,
+    SIMPLIFY = FALSE
+  )
+
+  list(
+    link = tagList(
+      if (length(modules$label)) tags$li(tags$span(modules$label, class = "module-group-label")),
+      tags$li(tags$ul(lapply(items, `[[`, "link")))
+    ),
+    tab_pane = tagList(lapply(items, `[[`, "tab_pane"))
   )
 }
 
-#' @rdname module_teal_modules_nav
+#' @rdname module_teal_module
 #' @export
-ui_teal_module.teal_module <- function(id, modules, active_module_id) {
+.ui_teal_module.teal_module <- function(id, modules, active_module_id) {
   ns <- NS(id)
   args <- c(list(id = ns("module")), modules$ui_args)
   ui_teal <- tags$div(
@@ -226,12 +208,25 @@ ui_teal_module.teal_module <- function(id, modules, active_module_id) {
       do.call(what = modules$ui, args = args, quote = TRUE)
     )
   )
+  container_id <- ns("wrapper")
   module_id <- modules$path
-  div(
-    id = ns("wrapper"),
+
+  link <- tags$li(
+    tags$a(
+      href = paste0("#", container_id), # links button with module content in `tab-content` with same id.
+      `data-bs-toggle` = "tab", # signals shiny to treat this element as bootstrap tab buttons for toggle.
+      `data-value` = module_id, # this data is set as the shiny input.
+      class = c("nav-link", "module-button", "btn-default", if (identical(module_id, active_module_id)) "active"),
+      # `nav-link` is required to mimic bslib tab panel.
+      modules$label
+    )
+  )
+
+  tab_pane <- div(
+    id = container_id,
     class = c("tab-pane", "teal_module", if (identical(module_id, active_module_id)) "active"),
     tagList(
-      .modules_breadcrumb(modules), # todo:
+      .modules_breadcrumb(modules),
       if (!is.null(modules$datanames)) {
         tagList(
           bslib::layout_sidebar(
@@ -321,17 +316,19 @@ ui_teal_module.teal_module <- function(id, modules, active_module_id) {
       }
     )
   )
+
+  list(link = link, tab_pane = tab_pane)
 }
 
-#' @rdname module_teal_modules_nav
-srv_teal_module <- function(id,
-                            data,
-                            modules,
-                            datasets = NULL,
-                            slices_global,
-                            reporter = teal.reporter::Reporter$new(),
-                            data_load_status = reactive("ok"),
-                            active_module_id = reactive(TRUE)) {
+#' @rdname module_teal_module
+.srv_teal_module <- function(id,
+                             data,
+                             modules,
+                             datasets = NULL,
+                             slices_global,
+                             reporter = teal.reporter::Reporter$new(),
+                             data_load_status = reactive("ok"),
+                             active_module_id = reactive(TRUE)) {
   checkmate::assert_string(id)
   assert_reactive(data)
   checkmate::assert_multi_class(modules, c("teal_modules", "teal_module"))
@@ -339,37 +336,37 @@ srv_teal_module <- function(id,
   checkmate::assert_class(slices_global, ".slicesGlobal")
   checkmate::assert_class(reporter, "Reporter")
   assert_reactive(data_load_status)
-  UseMethod("srv_teal_module", modules)
+  UseMethod(".srv_teal_module", modules)
 }
 
-#' @rdname module_teal_modules_nav
+#' @rdname module_teal_module
 #' @export
-srv_teal_module.default <- function(id,
-                                    data,
-                                    modules,
-                                    datasets = NULL,
-                                    slices_global,
-                                    reporter = teal.reporter::Reporter$new(),
-                                    data_load_status = reactive("ok"),
-                                    active_module_id = reactive(TRUE)) {
+.srv_teal_module.default <- function(id,
+                                     data,
+                                     modules,
+                                     datasets = NULL,
+                                     slices_global,
+                                     reporter = teal.reporter::Reporter$new(),
+                                     data_load_status = reactive("ok"),
+                                     active_module_id = reactive(TRUE)) {
   stop("Modules class not supported: ", paste(class(modules), collapse = " "))
 }
 
-#' @rdname module_teal_modules_nav
+#' @rdname module_teal_module
 #' @export
-srv_teal_module.teal_modules <- function(id,
-                                         data,
-                                         modules,
-                                         datasets = NULL,
-                                         slices_global,
-                                         reporter = teal.reporter::Reporter$new(),
-                                         data_load_status = reactive("ok"),
-                                         active_module_id = reactive(TRUE)) {
+.srv_teal_module.teal_modules <- function(id,
+                                          data,
+                                          modules,
+                                          datasets = NULL,
+                                          slices_global,
+                                          reporter = teal.reporter::Reporter$new(),
+                                          data_load_status = reactive("ok"),
+                                          active_module_id = reactive(TRUE)) {
   moduleServer(id = id, module = function(input, output, session) {
     logger::log_debug("srv_teal_module.teal_modules initializing the module { deparse1(modules$label) }.")
     modules_output <- mapply(
       function(id, modules) {
-        srv_teal_module(
+        .srv_teal_module(
           id = id,
           modules = modules,
           data = data,
@@ -389,16 +386,16 @@ srv_teal_module.teal_modules <- function(id,
   })
 }
 
-#' @rdname module_teal_modules_nav
+#' @rdname module_teal_module
 #' @export
-srv_teal_module.teal_module <- function(id,
-                                        data,
-                                        modules,
-                                        datasets = NULL,
-                                        slices_global,
-                                        reporter = teal.reporter::Reporter$new(),
-                                        data_load_status = reactive("ok"),
-                                        active_module_id = reactive(TRUE)) {
+.srv_teal_module.teal_module <- function(id,
+                                         data,
+                                         modules,
+                                         datasets = NULL,
+                                         slices_global,
+                                         reporter = teal.reporter::Reporter$new(),
+                                         data_load_status = reactive("ok"),
+                                         active_module_id = reactive(TRUE)) {
   logger::log_debug("srv_teal_module.teal_module initializing the module: { deparse1(modules$label) }.")
   moduleServer(id = id, module = function(input, output, session) {
     module_out <- reactiveVal()
@@ -588,10 +585,9 @@ srv_teal_module.teal_module <- function(id,
   )
 }
 
-#' @keywords internal
 .modules_breadcrumb <- function(module) {
   tags$span(
-    style = "color: var(--bs-secondary); font-size: medium;",
+    style = "color: var(--bs-secondary); font-size: medium;opacity: 0.6; margin-left: 0.5em;",
     paste("Home", module$path, sep = " / ")
   )
 }
diff --git a/R/module_snapshot_manager.R b/R/module_snapshot_manager.R
index 321d7a8af0..08c8ee0866 100644
--- a/R/module_snapshot_manager.R
+++ b/R/module_snapshot_manager.R
@@ -87,11 +87,10 @@ NULL
 #' @rdname module_snapshot_manager
 ui_snapshot_manager_panel <- function(id) {
   ns <- NS(id)
-  tags$button(
+  .expand_button(
     id = ns("show_snapshot_manager"),
-    class = "btn action-button wunder_bar_button",
-    title = "View snapshot manager",
-    suppressMessages(icon("fas fa-camera"))
+    label = "Snapshot Manager",
+    icon = "camera-fill"
   )
 }
 
@@ -120,15 +119,27 @@ srv_snapshot_manager_panel <- function(id, slices_global) {
 ui_snapshot_manager <- function(id) {
   ns <- NS(id)
   tags$div(
-    class = "manager_content",
     tags$div(
-      class = "manager_table_row",
+      class = "teal manager_table_row",
       tags$span(tags$b("Snapshot manager")),
-      actionLink(ns("snapshot_add"), label = NULL, icon = icon("fas fa-camera"), title = "add snapshot"),
-      actionLink(ns("snapshot_load"), label = NULL, icon = icon("fas fa-upload"), title = "upload snapshot"),
-      actionLink(ns("snapshot_reset"), label = NULL, icon = icon("fas fa-undo"), title = "reset initial state"),
+      bslib::tooltip(
+        tags$span(actionLink(ns("snapshot_add"), label = NULL, icon = icon("fas fa-camera"))),
+        "Add snapshot",
+        placement = "top"
+      ),
+      bslib::tooltip(
+        tags$span(actionLink(ns("snapshot_load"), label = NULL, icon = icon("fas fa-upload"))),
+        "Upload snapshot",
+        placement = "top"
+      ),
+      bslib::tooltip(
+        tags$span(actionLink(ns("snapshot_reset"), label = NULL, icon = icon("fas fa-undo"))),
+        "Reset initial state",
+        placement = "top"
+      ),
       NULL
     ),
+    tags$br(),
     uiOutput(ns("snapshot_list"))
   )
 }
@@ -144,7 +155,7 @@ srv_snapshot_manager <- function(id, slices_global) {
     # Register bookmark exclusions (all buttons and text fields).
     setBookmarkExclude(c(
       "snapshot_add", "snapshot_load", "snapshot_reset",
-      "snapshot_name_accept", "snaphot_file_accept",
+      "snapshot_name_accept", "snapshot_file_accept",
       "snapshot_name", "snapshot_file"
     ))
     # Add snapshot history to bookmark.
@@ -165,21 +176,34 @@ srv_snapshot_manager <- function(id, slices_global) {
     })
 
     # Snapshot current application state ----
-    # Name snaphsot.
+    # Name snapshot.
     observeEvent(input$snapshot_add, {
       logger::log_debug("srv_snapshot_manager: snapshot_add button clicked")
       showModal(
         modalDialog(
+          easyClose = TRUE,
           textInput(ns("snapshot_name"), "Name the snapshot", width = "100%", placeholder = "Meaningful, unique name"),
-          footer = tagList(
-            actionButton(ns("snapshot_name_accept"), "Accept", icon = icon("far fa-thumbs-up")),
-            modalButton(label = "Cancel", icon = icon("far fa-thumbs-down"))
+          footer = shiny::div(
+            shiny::tags$button(
+              type = "button",
+              class = "btn btn-outline-secondary",
+              `data-bs-dismiss` = "modal",
+              NULL,
+              "Dismiss"
+            ),
+            shiny::tags$button(
+              id = ns("snapshot_name_accept"),
+              type = "button",
+              class = "btn btn-primary action-button",
+              NULL,
+              "Accept"
+            )
           ),
           size = "s"
         )
       )
     })
-    # Store snaphsot.
+    # Store snapshot.
     observeEvent(input$snapshot_name_accept, {
       logger::log_debug("srv_snapshot_manager: snapshot_name_accept button clicked")
       snapshot_name <- trimws(input$snapshot_name)
@@ -215,6 +239,7 @@ srv_snapshot_manager <- function(id, slices_global) {
       logger::log_debug("srv_snapshot_manager: snapshot_load button clicked")
       showModal(
         modalDialog(
+          easyClose = TRUE,
           fileInput(ns("snapshot_file"), "Choose snapshot file", accept = ".json", width = "100%"),
           textInput(
             ns("snapshot_name"),
@@ -222,15 +247,33 @@ srv_snapshot_manager <- function(id, slices_global) {
             width = "100%",
             placeholder = "Meaningful, unique name"
           ),
-          footer = tagList(
-            actionButton(ns("snaphot_file_accept"), "Accept", icon = icon("far fa-thumbs-up")),
-            modalButton(label = "Cancel", icon = icon("far fa-thumbs-down"))
+          footer = shiny::div(
+            shiny::tags$button(
+              type = "button",
+              class = "btn btn-outline-secondary",
+              `data-bs-dismiss` = "modal",
+              NULL,
+              "Dismiss"
+            ),
+            shinyjs::disabled(
+              shiny::tags$button(
+                id = ns("snapshot_file_accept"),
+                type = "button",
+                class = "btn btn-primary action-button",
+                NULL,
+                "Accept"
+              )
+            )
           )
         )
       )
     })
+
+    observeEvent(input$snapshot_file, {
+      shinyjs::enable("snapshot_file_accept")
+    })
     # Store new snapshot to list and restore filter states.
-    observeEvent(input$snaphot_file_accept, {
+    observeEvent(input$snapshot_file_accept, {
       logger::log_debug("srv_snapshot_manager: snapshot_file_accept button clicked")
       snapshot_name <- trimws(input$snapshot_name)
       if (identical(snapshot_name, "")) {
@@ -333,10 +376,18 @@ srv_snapshot_manager <- function(id, slices_global) {
         # Create a row for the snapshot table.
         if (!is.element(id_rowme, names(divs))) {
           divs[[id_rowme]] <- tags$div(
-            class = "manager_table_row",
+            class = "teal manager_table_row",
             tags$span(tags$h5(s)),
-            actionLink(inputId = ns(id_pickme), label = icon("far fa-circle-check"), title = "select"),
-            downloadLink(outputId = ns(id_saveme), label = icon("far fa-save"), title = "save to file")
+            bslib::tooltip(
+              actionLink(inputId = ns(id_pickme), label = icon("far fa-circle-check")),
+              "select",
+              placement = "top"
+            ),
+            bslib::tooltip(
+              downloadLink(outputId = ns(id_saveme), label = icon("far fa-save")),
+              "save to file",
+              placement = "top"
+            )
           )
         }
       })
@@ -347,7 +398,6 @@ srv_snapshot_manager <- function(id, slices_global) {
       rows <- rev(reactiveValuesToList(divs))
       if (length(rows) == 0L) {
         tags$div(
-          class = "manager_placeholder",
           "Snapshots will appear here."
         )
       } else {
diff --git a/R/module_teal.R b/R/module_teal.R
index aad22f35e5..6be23ec334 100644
--- a/R/module_teal.R
+++ b/R/module_teal.R
@@ -50,8 +50,11 @@ ui_teal <- function(id, modules) {
   checkmate::assert_character(id, max.len = 1, any.missing = FALSE)
   checkmate::assert_class(modules, "teal_modules")
   ns <- NS(id)
+
+  mod <- extract_module(modules, class = "teal_module_previewer")
+  reporter_opts <- if (length(mod)) .get_reporter_options(mod[[1]]$server_args)
   modules <- drop_module(modules, "teal_module_landing")
-  modules <- append_reporter_module(modules)
+  modules <- drop_module(modules, "teal_module_previewer")
 
   shiny_busy_message_panel <- conditionalPanel(
     condition = "(($('html').hasClass('shiny-busy')) && (document.getElementById('shiny-notification-panel') == null))", # nolint: line_length.
@@ -64,23 +67,50 @@ ui_teal <- function(id, modules) {
           color: #ffffff; background-color: #347ab7; z-index: 105;"
     )
   )
+
+  navbar <- ui_teal_module(id = ns("teal_modules"), modules = modules)
+  module_items <- ui_teal_module(id = ns("teal_modules"), modules = modules)
+  nav_elements <- list(
+    withr::with_options(reporter_opts, { # for backwards compatibility of the report_previewer_module$server_args
+      shinyjs::hidden(
+        tags$div(
+          id = ns("reporter_menu_container"),
+          .teal_navbar_menu(
+            label = "Report",
+            icon = "file-text-fill",
+            class = "reporter-menu",
+            if ("preview" %in% getOption("teal.reporter.nav_buttons")) {
+              teal.reporter::preview_report_button_ui(ns("preview_report"), label = "Preview Report")
+            },
+            tags$hr(style = "margin: 0.5rem;"),
+            if ("download" %in% getOption("teal.reporter.nav_buttons")) {
+              teal.reporter::download_report_button_ui(ns("download_report"), label = "Download Report")
+            },
+            if ("load" %in% getOption("teal.reporter.nav_buttons")) {
+              teal.reporter::report_load_ui(ns("load_report"), label = "Load Report")
+            },
+            tags$hr(style = "margin: 0.5rem;"),
+            if ("reset" %in% getOption("teal.reporter.nav_buttons")) {
+              teal.reporter::reset_report_button_ui(ns("reset_reports"), label = "Reset Report")
+            }
+          )
+        )
+      )
+    }),
+    tags$span(style = "margin-left: auto;"),
+    ui_bookmark_panel(ns("bookmark_manager"), modules),
+    ui_snapshot_manager_panel(ns("snapshot_manager_panel")),
+    ui_filter_manager_panel(ns("filter_manager_panel"))
+  )
+  navbar <- .teal_navbar_append(navbar, nav_elements)
+
   bslib::page_fluid(
     id = id,
     theme = get_teal_bs_theme(),
     include_teal_css_js(),
+    shinyjs::useShinyjs(),
     shiny_busy_message_panel,
-    tags$div(
-      id = ns("options_buttons"),
-      style = "position: absolute; right: 10px;",
-      ui_bookmark_panel(ns("bookmark_manager"), modules),
-      ui_snapshot_manager_panel(ns("snapshot_manager_panel")),
-      ui_filter_manager_panel(ns("filter_manager_panel"))
-    ),
-    tags$div(
-      id = ns("tabpanel_wrapper"),
-      class = "teal-body",
-      ui_teal_modules_nav(id = ns("teal_modules"), modules = modules)
-    ),
+    tags$div(id = ns("tabpanel_wrapper"), class = "teal-body", navbar),
     tags$hr(style = "margin: 1rem 0 0.5rem 0;")
   )
 }
@@ -94,7 +124,7 @@ srv_teal <- function(id, data, modules, filter = teal_slices()) {
   checkmate::assert_class(filter, "teal_slices")
 
   modules <- drop_module(modules, "teal_module_landing")
-  modules <- append_reporter_module(modules)
+  modules <- drop_module(modules, "teal_module_previewer")
 
   moduleServer(id, function(input, output, session) {
     logger::log_debug("srv_teal initializing.")
@@ -103,7 +133,6 @@ srv_teal <- function(id, data, modules, filter = teal_slices()) {
       shinyjs::showLog()
     }
 
-
     # set timezone in shiny app
     # timezone is set in the early beginning so it will be available also
     # for `DDL` and all shiny modules
@@ -158,46 +187,44 @@ srv_teal <- function(id, data, modules, filter = teal_slices()) {
       }
     })
 
-    datasets_rv <- if (!isTRUE(attr(filter, "module_specific"))) {
-      eventReactive(data_signatured(), {
-        req(inherits(data_signatured(), "teal_data"))
-        logger::log_debug("srv_teal@1 initializing FilteredData")
-        teal_data_to_filtered_data(data_signatured())
-      })
-    }
-
-
     if (inherits(data, "teal_data_module")) {
-      setBookmarkExclude(c("teal_modules-active_tab"))
-      insertUI(
-        selector = ".teal-modules-wrapper .nav-item-custom",
-        where = "beforeBegin",
-        actionButton(session$ns("open_teal_data_module_ui"), NULL, icon = icon("database"))
+      setBookmarkExclude(c("teal_data_module_ui", "open_teal_data_module_ui"))
+      .teal_navbar_insert_ui(
+        ui = .expand_button(
+          id = session$ns("open_teal_data_module_ui"),
+          label = "Load Data",
+          icon = "database-fill"
+        )
       )
-      observeEvent(input$open_teal_data_module_ui, ignoreInit = TRUE, ignoreNULL = FALSE, {
-        showModal(
-          div(
-            class = "teal teal-data-module-popup",
-            modalDialog(
-              id = session$ns("teal_data_module_ui"),
-              size = "xl",
-              tags$div(
-                ui_init_data(session$ns("data")),
-                validate_ui
-              ),
-              easyClose = FALSE,
-              footer = tags$div(id = session$ns("close_teal_data_module_modal"), modalButton("Dismiss"))
+      observeEvent(
+        input$open_teal_data_module_ui,
+        ignoreInit = TRUE,
+        ignoreNULL = FALSE, # should be shown on startup
+        {
+          showModal(
+            div(
+              class = "teal teal-data-module-popup",
+              modalDialog(
+                id = session$ns("teal_data_module_ui"),
+                size = "xl",
+                tags$div(
+                  ui_init_data(session$ns("data")),
+                  validate_ui
+                ),
+                easyClose = FALSE,
+                footer = tags$div(id = session$ns("close_teal_data_module_modal"), modalButton("Dismiss"))
+              )
             )
           )
-        )
-        if (data_load_status() == "ok") {
-          shinyjs::enable(id = "close_teal_data_module_modal")
-        } else {
-          shinyjs::disable(id = "close_teal_data_module_modal")
+          if (data_load_status() == "ok") {
+            shinyjs::enable(id = "close_teal_data_module_modal")
+          } else {
+            shinyjs::disable(id = "close_teal_data_module_modal")
+          }
         }
-      })
+      )
 
-      if (attr(data, "once")) {
+      if (isTRUE(attr(data, "once"))) {
         observeEvent(data_signatured(), once = TRUE, {
           logger::log_debug("srv_teal@2 removing data tab.")
           # when once = TRUE we pull data once and then remove data tab
@@ -215,22 +242,41 @@ srv_teal <- function(id, data, modules, filter = teal_slices()) {
       insertUI(
         selector = sprintf("#%s", session$ns("tabpanel_wrapper")),
         where = "beforeBegin",
-        ui = tags$div(validate_ui, tags$br())
+        ui = tags$div(validate_ui)
       )
     }
 
+    if (is_arg_used(modules, "reporter")) {
+      shinyjs::show("reporter_menu_container")
+    } else {
+      removeUI(selector = sprintf("#%s", session$ns("reporter_menu_container")))
+    }
     reporter <- teal.reporter::Reporter$new()$set_id(attr(filter, "app_id"))
+    teal.reporter::preview_report_button_srv("preview_report", reporter)
+    teal.reporter::report_load_srv("load_report", reporter)
+    teal.reporter::download_report_button_srv(id = "download_report", reporter = reporter)
+    teal.reporter::reset_report_button_srv("reset_reports", reporter)
+
+    datasets_rv <- if (!isTRUE(attr(filter, "module_specific"))) {
+      eventReactive(data_signatured(), {
+        req(inherits(data_signatured(), "teal_data"))
+        logger::log_debug("srv_teal@1 initializing FilteredData")
+        teal_data_to_filtered_data(data_signatured())
+      })
+    }
     module_labels <- unlist(modules_slot(modules, "label"), use.names = FALSE)
     slices_global <- methods::new(".slicesGlobal", filter, module_labels)
-    modules_output <- srv_teal_modules_nav(
-      id = "teal_modules",
+
+    modules_output <- srv_teal_module(
+      "teal_modules",
       data = data_signatured,
-      datasets = datasets_rv,
       modules = modules,
+      datasets = datasets_rv,
       slices_global = slices_global,
-      data_load_status = data_load_status,
-      reporter = reporter
+      reporter = reporter,
+      data_load_status = data_load_status
     )
+
     mapping_table <- srv_filter_manager_panel("filter_manager_panel", slices_global = slices_global)
     snapshots <- srv_snapshot_manager_panel("snapshot_manager_panel", slices_global = slices_global)
     srv_bookmark_panel("bookmark_manager", modules)
diff --git a/R/modules.R b/R/modules.R
index 895cfd332f..d00eba7b23 100644
--- a/R/modules.R
+++ b/R/modules.R
@@ -645,19 +645,6 @@ append_module <- function(modules, module) {
   modules
 }
 
-#' @rdname module_teal
-#' @keywords internal
-#' @noRd
-append_reporter_module <- function(modules) {
-  if (is_arg_used(modules, "reporter") && length(extract_module(modules, "teal_module_previewer")) == 0) {
-    modules <- append_module(
-      modules,
-      reporter_previewer_module(server_args = list(previewer_buttons = c("download", "reset")))
-    )
-  }
-  modules
-}
-
 #' Extract/Remove module(s) of specific class
 #'
 #' Given a `teal_module` or a `teal_modules`, return the elements of the structure according to `class`.
diff --git a/R/reporter_previewer_module.R b/R/reporter_previewer_module.R
index 19b707b34f..20ee7aa19a 100644
--- a/R/reporter_previewer_module.R
+++ b/R/reporter_previewer_module.R
@@ -1,29 +1,40 @@
 #' Create a `teal` module for previewing a report
 #'
-#' @description `r lifecycle::badge("experimental")`
+#' @description `r lifecycle::badge("deprecated")`
 #'
-#' This function wraps [teal.reporter::reporter_previewer_ui()] and
-#' [teal.reporter::reporter_previewer_srv()] into a `teal_module` to be
-#' used in `teal` applications.
-#'
-#' If you are creating a `teal` application using [init()] then this
-#' module will be added to your application automatically if any of your `teal_modules`
-#' support report generation.
+#' This function controls the appearance of the drop-down menu for the reporter.
+#' It is now deprecated in favor of the options:
+#' - `teal.reporter.nav_buttons = c("preview", "load", "download", "reset")` to control which
+#'  buttons will be displayed in the drop-down.
+#' - `teal.reporter.rmd_outputs`: passed to [teal.reporter::download_report_button_srv()]
+#' - `teal.reporter.rmd_yaml_args`: passed to [teal.reporter::download_report_button_srv()]
+#' - `teal.reporter.knitr_global`: passed to [teal.reporter::download_report_button_srv()]
 #'
 #' @inheritParams teal_modules
-#' @param server_args (named `list`)
-#'  Arguments passed to [teal.reporter::reporter_previewer_srv()].
+#' @param server_args (named `list`) Arguments will overwrite the default `teal.reporter` options
+#' described in the description.
 #'
 #' @return
 #' `teal_module` (extended with `teal_module_previewer` class) containing the `teal.reporter` previewer functionality.
 #'
 #' @export
-#'
 reporter_previewer_module <- function(label = "Report previewer", server_args = list()) {
   checkmate::assert_string(label)
   checkmate::assert_list(server_args, names = "named")
   checkmate::assert_true(all(names(server_args) %in% names(formals(teal.reporter::reporter_previewer_srv))))
 
+  lifecycle::deprecate_soft(
+    when = "1.0.0",
+    what = "reporter_previewer_module()",
+    details = paste(
+      "Please use `options()` to customize the reporter options:\n",
+      "`teal.reporter.nav_buttons` to control which buttons will be displayed in the 'Report' drop-down.\n",
+      "`teal.reporter.rmd_outputs` to customize the R Markdown outputs types for the report.\n",
+      "`teal.reporter.rmd_yaml_args` to customize the widget inputs in the download report modal.\n",
+      "`teal.reporter.knitr_global` to customize the global knitr options for the report."
+    )
+  )
+
   message("Initializing reporter_previewer_module")
 
   srv <- function(id, reporter, ...) {
@@ -46,3 +57,29 @@ reporter_previewer_module <- function(label = "Report previewer", server_args =
   attr(module, "teal_bookmarkable") <- TRUE
   module
 }
+
+#' Temporary function to handle server_args of the report_previewer_module before its hard
+#' deprecation.
+#' @param args (`list`)
+#'
+#' @keywords internal
+.get_reporter_options <- function(args) {
+  opts <- list()
+  if (length(args$previewer_buttons)) {
+    opts <- c(opts, list(teal.reporter.nav_buttons = args$previewer_buttons))
+  }
+
+  if (length(args$global_knitr)) {
+    opts <- c(opts, list(teal.reporter.global_knitr = args$global_knitr))
+  }
+
+  if (length(args$rmd_output)) {
+    opts <- c(opts, list(teal.reporter.rmd_output = args$rmd_output))
+  }
+
+  if (length(args$rmd_yaml_args)) {
+    opts <- c(opts, list(teal.reporter.rmd_yaml_args = args$rmd_yaml_args))
+  }
+
+  opts
+}
diff --git a/R/utils.R b/R/utils.R
index 6dd53dc119..7c551cf834 100644
--- a/R/utils.R
+++ b/R/utils.R
@@ -491,3 +491,49 @@ pluralize <- function(x, singular, plural = NULL) {
     }
   }
 }
+
+#' @keywords internal
+.dropdown_button <- function(id = NULL, label, icon) {
+  tags$span(
+    class = "teal dropdown-button",
+    tags$a(
+      id = id,
+      class = "action-button",
+      role = "button",
+      style = "text-decoration: none;",
+      bsicons::bs_icon(icon, class = "text-primary"),
+      label,
+      bsicons::bs_icon("chevron-down", class = "text-primary dropdown-arrow")
+    )
+  )
+}
+
+#' @keywords internal
+.expand_button <- function(id, label, icon) {
+  tags$span(
+    class = "teal expand-button",
+    tags$a(
+      id = id,
+      class = "action-button",
+      role = "button",
+      style = "text-decoration: none;",
+      tags$span(class = "icon", bsicons::bs_icon(icon, class = "text-primary")),
+      tags$span(class = "label", label)
+    )
+  )
+}
+
+
+#' @keywords internal
+.primary_button <- function(id, label, icon = NULL) {
+  tags$a(
+    id = id,
+    class = "teal primary-button action-button",
+    role = "button",
+    style = "text-decoration: none;",
+    if (!is.null(icon)) {
+      bsicons::bs_icon(icon, class = "text-primary")
+    },
+    label
+  )
+}
diff --git a/R/zzz.R b/R/zzz.R
index 62c8029561..055e2cdf70 100644
--- a/R/zzz.R
+++ b/R/zzz.R
@@ -4,7 +4,8 @@
   teal_default_options <- list(
     teal.show_js_log = FALSE,
     teal.lockfile.mode = "auto",
-    shiny.sanitize.errors = FALSE
+    shiny.sanitize.errors = FALSE,
+    teal.reporter.nav_buttons = c("preview", "load", "download", "reset")
   )
 
   op <- options()
diff --git a/inst/WORDLIST b/inst/WORDLIST
index bdb48c7793..f1bf9a247c 100644
--- a/inst/WORDLIST
+++ b/inst/WORDLIST
@@ -1,29 +1,30 @@
+args
 Biomarker
+bookmarkable
 CDISC
-Forkers
 Hoffmann
-MAEs
-ORCID
-Shinylive
-TLG
-Transformators
-UI
-UX
-args
-bookmarkable
 favicon
 favicons
+Forkers
 funder
 lockfile
+MAEs
 modularized
+navbar
 omics
+ORCID
 pre
 quosure
 reactively
 summarization
+Shinylive
 tabset
 themer
 theming
+TLG
 transformator
 transformators
+Transformators
 ui
+UI
+UX
\ No newline at end of file
diff --git a/inst/css/custom.css b/inst/css/custom.css
index 7a5039b1d8..46bd4d4e94 100644
--- a/inst/css/custom.css
+++ b/inst/css/custom.css
@@ -75,3 +75,51 @@ body > div:has(~ #shiny-modal-wrapper .blur_background) {
     --bs-modal-width: 90vw;
   }
 }
+
+.teal.expand-button {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
+  overflow: hidden;
+  white-space: nowrap;
+  max-width: 40px;
+  transition: max-width 0.3s ease;
+}
+
+.teal.expand-button a {
+  border: 2px solid transparent;
+  padding: 0.5rem;
+}
+
+.teal.expand-button .label {
+  opacity: 0;
+  transition: opacity 0.2s ease;
+}
+
+.teal.expand-button:hover {
+  max-width: 200px;
+}
+
+.teal.expand-button:hover a {
+  border-bottom: 2px solid var(--bs-primary-border-subtle);
+}
+
+.teal.expand-button:hover .label {
+  opacity: 1;
+}
+
+.teal.primary-button {
+  border: solid 1px var(--bs-primary);
+  padding: 0.3em;
+  border-radius: 5px;
+}
+
+.teal.primary-button.disabled {
+  color: var(--bs-primary);
+  pointer-events: none;
+  opacity: 0.65;
+}
+
+.teal.primary-button:not(.disabled):hover {
+  background: var(--bs-primary-bg-subtle);
+}
diff --git a/inst/css/sidebar.css b/inst/css/sidebar.css
index 930e7401f1..3199abc2d0 100644
--- a/inst/css/sidebar.css
+++ b/inst/css/sidebar.css
@@ -32,23 +32,15 @@ a.disabled {
   justify-content: center;
 }
 
-.manager_table_row {
+.teal.manager_table_row {
   display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.manager_table_row *:first-child {
-  flex: 1 1 80%;
-}
-
-.manager_table_row * + * {
-  flex: 0 0 0px;
-  padding: 0em 1.5em;
+  justify-content: space-around;
+  gap: 2em;
+  margin-top: 10px;
 }
 
-.manager_placeholder {
-  margin-top: 1em;
+.teal.manager_table_row > span {
+  margin-right: auto;
 }
 
 .teal-sidebar {
@@ -56,8 +48,8 @@ a.disabled {
 }
 
 .teal-sidebar .accordion-button {
-  --bs-accordion-btn-bg: #ededed;
-  --bs-accordion-active-bg: #ededed;
+  --bs-accordion-btn-bg: rgba(var(--bs-secondary-rgb), 0.1);
+  --bs-accordion-active-bg: rgba(var(--bs-secondary-rgb), 0.1);
   --bs-accordion-btn-padding-x: 1rem;
   --bs-accordion-btn-padding-y: 0.7rem;
 }
@@ -68,8 +60,8 @@ a.disabled {
 }
 
 .teal-sidebar .accordion-button:hover {
-  --bs-accordion-btn-bg: #c5c5c5;
-  --bs-accordion-active-bg: #c5c5c5;
+  --bs-accordion-btn-bg: rgba(var(--bs-secondary-rgb), 0.3);
+  --bs-accordion-active-bg: rgba(var(--bs-secondary-rgb), 0.3);
 }
 
 .teal-transform-accordian .accordion-button {
diff --git a/inst/module-navigation/module-navigation.css b/inst/module-navigation/module-navigation.css
index 18d845bd3e..62e608e5c4 100644
--- a/inst/module-navigation/module-navigation.css
+++ b/inst/module-navigation/module-navigation.css
@@ -8,7 +8,7 @@
   margin: 2px;
   padding: var(--bs-nav-link-padding-y) var(--bs-nav-link-padding-x);
   border: 1px solid var(--bs-primary-border-subtle);
-  border-radius: 12px;
+  border-radius: 5px;
   background: white;
   color: var(--bs-primary);
   display: inline-flex;
@@ -25,11 +25,67 @@
 }
 
 .teal-modules-wrapper .dropdown.nav-item-custom {
-  border-bottom: 2px solid #4dabf7;
+  padding: 0.25rem;
+}
+
+.dropdown.nav-item-custom:not(.dropdown-menu) {
+  cursor: pointer;
+}
+
+.dropdown.nav-item-custom > .dropdown-menu {
+  cursor: auto;
+}
+
+.dropdown.nav-item-custom:hover > .dropdown-menu {
+  opacity: 1;
+  transform: scaleY(1);
+  pointer-events: auto;
+}
+
+.dropdown.nav-item-custom:hover .dropdown-arrow {
+  transform: rotate(180deg);
+}
+
+.dropdown.nav-item-custom::before {
+  content: "";
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  height: 5px;
+  background: transparent;
+  z-index: 1045;
+}
+
+.dropdown.nav-item-custom {
+  position: relative;
+}
+
+.dropdown.nav-item-custom .teal-reporter.outline-button .badge {
+  margin-left: 1em;
+}
+
+.teal.dropdown-button {
+  border: 2px solid transparent;
+  margin: 0.25em;
+  cursor: pointer;
+}
+
+.teal.dropdown-button .dropdown-arrow {
+  transition: transform 0.3s ease;
+}
+
+.teal.dropdown-button:hover .dropdown-arrow {
+  transform: rotate(180deg);
+}
+
+.teal.dropdown-button:hover {
+  border-bottom: 2px solid var(--bs-primary-border-subtle);
 }
 
 .nav-item-custom > .dropdown-menu {
   opacity: 0;
+  margin-top: 5px;
   transform: scale(0.8, 0.8);
   transform-origin: top left;
   transition: opacity 0.18s cubic-bezier(0.4, 0, 0.2, 1),
@@ -46,16 +102,33 @@
 
 .teal-modules-wrapper .dropdown-menu {
   z-index: 1046;
-  width: 700px;
   max-width: calc(100vw - 2rem);
   max-height: 80vh;
-  padding: 1.5rem;
+  padding: 1rem;
   overflow-y: auto;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
   border: 1px solid #dee2e6;
   border-radius: 8px;
 }
 
+.teal-modules-wrapper .dropdown-menu > .teal-modules-tree {
+  width: 700px;
+}
+
+.teal-modules-wrapper .dropdown-menu > .reporter-menu {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+  padding: 1rem;
+  flex-direction: column;
+  gap: 0.5rem;
+  padding: 0;
+}
+
+.teal-modules-wrapper .dropdown-menu > .reporter-menu .teal-reporter {
+  white-space: nowrap;
+}
+
 .teal-modules-wrapper .dropdown-toggle {
   padding: 10px;
 }
@@ -83,23 +156,24 @@
   position: absolute;
   top: -1em;
   left: -1.25em;
-  width: 1.5em;
+  width: 1.4em;
   height: 100%;
-  border-left: 1px solid var(--bs-border-color, #bbb);
-  border-bottom: 1px solid var(--bs-border-color, #bbb);
+  border-left: 2px solid var(--bs-border-color, #bbb);
+  border-bottom: 2px solid var(--bs-border-color, #bbb);
   pointer-events: none;
 }
 
-.teal-modules-tree ul > li:has(a):last-child::before {
-  border-left: 1px solid transparent;
+.teal-modules-tree li:has(ul)::before {
+  border-left: 2px solid transparent;
+  border-bottom: 2px solid transparent;
 }
 
-ul.teal-modules-tree > li > ul > li:last-child:before {
-  border-left: 1px solid var(--bs-border-color, #bbb);
+.teal-modules-tree > li > ul > li:has(> a) ~ li::before {
+  border-left: 2px solid var(--bs-border-color, #bbb);
 }
 
-.teal-modules-tree > li::before {
-  display: none;
+.teal-modules-tree > li > ul > li:last-child:has(> ul)::before {
+  border-left: 2px solid transparent;
 }
 
 .teal-modules-tree li > a,
@@ -121,16 +195,3 @@ ul.teal-modules-tree > li > ul > li:last-child:before {
   background: #fff;
   position: relative;
 }
-
-.teal-modules-tree li:has(a:hover)::before,
-.teal-modules-tree li:has(a:active)::before {
-  border-color: var(--bs-primary, #0d6efd);
-}
-
-.teal-modules-tree li:has(a.active)::before {
-  border-color: var(--bs-secondary, #6c757d);
-}
-
-.teal-modules-tree ul > li:has(a.active):last-child::before {
-  border-left: 1px solid transparent;
-}
diff --git a/inst/module-navigation/module-navigation.js b/inst/module-navigation/module-navigation.js
deleted file mode 100644
index 99e07e5caf..0000000000
--- a/inst/module-navigation/module-navigation.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function initNavigationMouseOver() {
-  this.classList.add("show");
-  this.querySelector(".dropdown-toggle").classList.add("show");
-  this.querySelector(".dropdown-toggle").setAttribute("aria-expanded", "true");
-  this.querySelector(".dropdown-menu").classList.add("show");
-}
-
-function initNavigationMouseOut() {
-  this.classList.remove("show");
-  this.querySelector(".dropdown-toggle").classList.remove("show");
-  this.querySelector(".dropdown-toggle").setAttribute("aria-expanded", "false");
-  this.querySelector(".dropdown-menu").classList.remove("show");
-}
diff --git a/man/dot-get_reporter_options.Rd b/man/dot-get_reporter_options.Rd
new file mode 100644
index 0000000000..54a9e96ed2
--- /dev/null
+++ b/man/dot-get_reporter_options.Rd
@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/reporter_previewer_module.R
+\name{.get_reporter_options}
+\alias{.get_reporter_options}
+\title{Temporary function to handle server_args of the report_previewer_module before its hard
+deprecation.}
+\usage{
+.get_reporter_options(args)
+}
+\arguments{
+\item{args}{(\code{list})}
+}
+\description{
+Temporary function to handle server_args of the report_previewer_module before its hard
+deprecation.
+}
+\keyword{internal}
diff --git a/man/module_teal_modules_nav.Rd b/man/module_teal_module.Rd
similarity index 51%
rename from man/module_teal_modules_nav.Rd
rename to man/module_teal_module.Rd
index a42cdaae35..735e86c65a 100644
--- a/man/module_teal_modules_nav.Rd
+++ b/man/module_teal_module.Rd
@@ -1,22 +1,25 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in R/module_nested_tabs.R
-\name{module_teal_modules_nav}
-\alias{module_teal_modules_nav}
-\alias{srv_teal_modules_nav}
-\alias{ui_teal_modules_nav_dropdown}
-\alias{ui_teal_modules_nav_dropdown.teal_modules}
-\alias{ui_teal_modules_nav_dropdown.teal_module}
+\name{module_teal_module}
+\alias{module_teal_module}
 \alias{ui_teal_module}
-\alias{ui_teal_module.default}
-\alias{ui_teal_module.teal_modules}
-\alias{ui_teal_module.teal_module}
 \alias{srv_teal_module}
-\alias{srv_teal_module.default}
-\alias{srv_teal_module.teal_modules}
-\alias{srv_teal_module.teal_module}
+\alias{.teal_navbar_append}
+\alias{.teal_navbar_insert_ui}
+\alias{.teal_navbar_menu}
+\alias{.ui_teal_module}
+\alias{.ui_teal_module.default}
+\alias{.ui_teal_module.teal_modules}
+\alias{.ui_teal_module.teal_module}
+\alias{.srv_teal_module}
+\alias{.srv_teal_module.default}
+\alias{.srv_teal_module.teal_modules}
+\alias{.srv_teal_module.teal_module}
 \title{Calls all \code{modules}}
 \usage{
-srv_teal_modules_nav(
+ui_teal_module(id, modules)
+
+srv_teal_module(
   id,
   data,
   modules,
@@ -26,21 +29,25 @@ srv_teal_modules_nav(
   data_load_status = reactive("ok")
 )
 
-ui_teal_modules_nav_dropdown(id, modules, active_module_id)
+.teal_navbar_append(navbar, child)
 
-\method{ui_teal_modules_nav_dropdown}{teal_modules}(id, modules, active_module_id)
+.teal_navbar_insert_ui(
+  ui,
+  where = "afterBegin",
+  session = getDefaultReactiveDomain()
+)
 
-\method{ui_teal_modules_nav_dropdown}{teal_module}(id, modules, active_module_id)
+.teal_navbar_menu(..., id = NULL, label = NULL, class = NULL, icon = NULL)
 
-ui_teal_module(id, modules, active_module_id)
+.ui_teal_module(id, modules, active_module_id)
 
-\method{ui_teal_module}{default}(id, modules, active_module_id)
+\method{.ui_teal_module}{default}(id, modules, active_module_id)
 
-\method{ui_teal_module}{teal_modules}(id, modules, active_module_id)
+\method{.ui_teal_module}{teal_modules}(id, modules, active_module_id)
 
-\method{ui_teal_module}{teal_module}(id, modules, active_module_id)
+\method{.ui_teal_module}{teal_module}(id, modules, active_module_id)
 
-srv_teal_module(
+.srv_teal_module(
   id,
   data,
   modules,
@@ -51,7 +58,7 @@ srv_teal_module(
   active_module_id = reactive(TRUE)
 )
 
-\method{srv_teal_module}{default}(
+\method{.srv_teal_module}{default}(
   id,
   data,
   modules,
@@ -62,7 +69,7 @@ srv_teal_module(
   active_module_id = reactive(TRUE)
 )
 
-\method{srv_teal_module}{teal_modules}(
+\method{.srv_teal_module}{teal_modules}(
   id,
   data,
   modules,
@@ -73,7 +80,7 @@ srv_teal_module(
   active_module_id = reactive(TRUE)
 )
 
-\method{srv_teal_module}{teal_module}(
+\method{.srv_teal_module}{teal_module}(
   id,
   data,
   modules,
@@ -87,13 +94,13 @@ srv_teal_module(
 \arguments{
 \item{id}{(\code{character(1)}) \code{shiny} module instance id.}
 
-\item{data}{(\code{reactive} returning \code{teal_data})}
-
 \item{modules}{(\code{teal_modules})
 \code{teal_modules} object. These are the specific output modules which
 will be displayed in the \code{teal} application. See \code{\link[=modules]{modules()}} and \code{\link[=module]{module()}} for
 more details.}
 
+\item{data}{(\code{reactive} returning \code{teal_data})}
+
 \item{datasets}{(\code{reactive} returning \code{FilteredData} or \code{NULL})
 When \code{datasets} is passed from the parent module (\code{srv_teal}) then \code{dataset} is a singleton
 which implies the filter-panel to be "global". When \code{NULL} then filter-panel is "module-specific".}
@@ -101,6 +108,9 @@ which implies the filter-panel to be "global". When \code{NULL} then filter-pane
 \item{slices_global}{(\code{reactiveVal} returning \code{modules_teal_slices})
 see \code{\link{module_filter_manager}}}
 
+\item{reporter}{(\code{Reporter}, singleton)
+Stores reporter-cards appended in the server of \code{teal_module}.}
+
 \item{data_load_status}{(\code{reactive} returning \code{character(1)})
 Determines action dependent on a data loading status:
 \itemize{
@@ -117,48 +127,32 @@ panel.
 Output of currently active module.
 \itemize{
 \item \code{srv_teal_module.teal_module} returns \code{reactiveVal} containing output of the called module.
-\item \code{srv_teal_module.teal_modules} returns output of module selected by drop-down.
-\item \code{srv_teal_modules_nav} bypasses output of \code{srv_teal_module.teal_modules}.
+\item \code{srv_teal_module.teal_modules} returns output of modules in a list following the hierarchy of \code{modules}
 }
 }
 \description{
-Module calls \code{modules} with \code{id} according to their location in the tree. There are multiple modules
-managing this process:
-\itemize{
-\item \code{ui/srv_teal_modules_nav} container module where \code{input$active_module_id} exists.
-\item \code{ui_teal_modules_nav_dropdown} creates drop-down menu to select active module.
-\item \code{ui/srv_teal_module} creates tab containers for each module. Only one module is visible at the time as a result
-of selecting in \code{ui_teal_modules_nav_dropdown}.
-}
+Modules create navigation bar with drop-down menu and tab content. Each \code{teal_module} is called recursively
+according to the structure of \code{modules} argument. This is a custom module which utilizes shiny/Bootstrap
+\code{.nav} class. \code{modules} are called with an \code{id} derived from \code{teal_module}'s label and labels of its
+ancestors (if any).
 }
 \details{
-\subsection{UI}{
-
-On the UI side, a drop-down is created that lists buttons labeled with the labels of all \code{teal_module}s.
-The buttons in the drop-down are grouped according to their respective groups.
-These UI components are created in a way to utilize navigation-bar functionality of shiny.
-To achieve this, the buttons need to be placed inside a \verb{<ul class = "nav shiny-tab-input">}.
-\enumerate{
-\item Each module button has following attributes:
-}
+\subsection{Functions}{
 \itemize{
-\item \code{href = "#<teal_module container id>"} links button with the container of the specific \code{teal_module}
-\item \code{data-bs-toggle = "tab"} tells Bootstrap to hide or show \code{teal_module}'s content
-\item \code{data-value = "<teal_module$path>"} This attribute is taken by shiny from all buttons of class "active"
-and used as \code{input$active_module_id} in the namespace of \code{\link[=srv_teal_modules_nav]{srv_teal_modules_nav()}}.
-}
-\enumerate{
-\item Each module content is wrapped in a container with the \code{class = "tab-pane"} with a unique \code{id}.
-This tells Bootstrap library that clicking a button should toggle relevant "tab"
-with an \code{id} matching button's \code{href} attribute.
+\item \code{ui/srv_teal_module} - wrapper module which links drop-down buttons with modules panels.
+Here \code{input$active_module_id} is instantiated.
+\item \code{.ui/srv_teal_module} - recursive S3 method which calls each module
+\item \code{.teal_navbar_append} - wrapper for \code{\link[htmltools:tagAppendChild]{htmltools::tagAppendChild()}} to add any element to navigation bar.
+\item \code{.teal_navbar_insert_ui} - wrapper for \code{\link[shiny:insertUI]{shiny::insertUI()}} to insert any element to navigation bar.
+\item \code{.teal_navbar_menu} - UI function to create a drop-down menu for navigation bar.
 }
 }
 
-\subsection{Server}{
+\subsection{Utilizing \code{.nav} class}{
 
-On the server side, \code{teal_module}(s) are called with \code{id} respective to their label and group.
-\code{input$active_module_id} determines which module is currently active and only this module
-observes reactive changes.
+No extra \code{javascript} or server functionality were introduced to have navigation buttons toggle between
+tab panels. This works thanks to \code{.nav} container which links \code{.nav-link} buttons \verb{href = #<module id>}
+attribute with \code{.tab-pane}'s \verb{id = <module id>} (see ``.ui_teal_module.teal_module`).
 }
 
 \subsection{Initialization and isolation of the \code{teal_module}(s)}{
diff --git a/man/reporter_previewer_module.Rd b/man/reporter_previewer_module.Rd
index e54418141d..24166858be 100644
--- a/man/reporter_previewer_module.Rd
+++ b/man/reporter_previewer_module.Rd
@@ -10,20 +10,22 @@ reporter_previewer_module(label = "Report previewer", server_args = list())
 \item{label}{(\code{character(1)}) Label shown in the navigation item for the module or module group.
 For \code{modules()} defaults to \code{"root"}. See \code{Details}.}
 
-\item{server_args}{(named \code{list})
-Arguments passed to \code{\link[teal.reporter:reporter_previewer]{teal.reporter::reporter_previewer_srv()}}.}
+\item{server_args}{(named \code{list}) Arguments will overwrite the default \code{teal.reporter} options
+described in the description.}
 }
 \value{
 \code{teal_module} (extended with \code{teal_module_previewer} class) containing the \code{teal.reporter} previewer functionality.
 }
 \description{
-\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#experimental}{\figure{lifecycle-experimental.svg}{options: alt='[Experimental]'}}}{\strong{[Experimental]}}
+\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#deprecated}{\figure{lifecycle-deprecated.svg}{options: alt='[Deprecated]'}}}{\strong{[Deprecated]}}
 
-This function wraps \code{\link[teal.reporter:reporter_previewer]{teal.reporter::reporter_previewer_ui()}} and
-\code{\link[teal.reporter:reporter_previewer]{teal.reporter::reporter_previewer_srv()}} into a \code{teal_module} to be
-used in \code{teal} applications.
-
-If you are creating a \code{teal} application using \code{\link[=init]{init()}} then this
-module will be added to your application automatically if any of your \code{teal_modules}
-support report generation.
+This function controls the appearance of the drop-down menu for the reporter.
+It is now deprecated in favor of the options:
+\itemize{
+\item \code{teal.reporter.nav_buttons = c("preview", "load", "download", "reset")} to control which
+buttons will be displayed in the drop-down.
+\item \code{teal.reporter.rmd_outputs}: passed to \code{\link[teal.reporter:download_report_button]{teal.reporter::download_report_button_srv()}}
+\item \code{teal.reporter.rmd_yaml_args}: passed to \code{\link[teal.reporter:download_report_button]{teal.reporter::download_report_button_srv()}}
+\item \code{teal.reporter.knitr_global}: passed to \code{\link[teal.reporter:download_report_button]{teal.reporter::download_report_button_srv()}}
+}
 }
diff --git a/tests/testthat/test-module_teal.R b/tests/testthat/test-module_teal.R
index fffb82800d..5fd9fd109c 100644
--- a/tests/testthat/test-module_teal.R
+++ b/tests/testthat/test-module_teal.R
@@ -514,7 +514,7 @@ testthat::describe("srv_teal teal_modules", {
           modules = modules(module("module_1", server = function(id, data) data))
         ),
         expr = {
-          session$setInputs("teal_modules-active_module_id" = "module_1")
+          session$setInputs(`teal_modules-active_module_id` = "module_1")
           testthat::expect_equal(
             trimws(
               rvest::html_text2(
@@ -547,7 +547,7 @@ testthat::describe("srv_teal teal_modules", {
           )
         ),
         expr = {
-          session$setInputs("teal_modules-active_module_id" = "module_1")
+          session$setInputs(`teal_modules-active_module_id` = "module_1")
           session$flushReact()
 
           testthat::expect_equal(
@@ -1060,24 +1060,6 @@ testthat::describe("srv_teal teal_modules", {
       }
     )
   })
-
-  testthat::it("receives one report_previewer module when any module contains reporter argument", {
-    shiny::testServer(
-      app = srv_teal,
-      args = list(
-        id = "test",
-        data = teal.data::teal_data(iris = iris, mtcars = mtcars),
-        modules = modules(
-          module("module_1", server = function(id, reporter) {}),
-          module("module_2", server = function(id) {})
-        )
-      ),
-      expr = {
-        session$setInputs(`teal_modules-active_module_id` = "report_previewer")
-        testthat::expect_setequal(names(modules_output), c("module_1", "module_2", "report_previewer"))
-      }
-    )
-  })
 })
 
 testthat::describe("srv_teal filters", {
@@ -1525,7 +1507,7 @@ testthat::describe("srv_teal filters", {
           modules = modules(module("module_1", server = function(id, data) data))
         ),
         expr = {
-          session$setInputs("teal_modules-active_module_id" = "module_1")
+          session$setInputs(`teal_modules-active_module_id` = "module_1")
           session$flushReact()
           testthat::expect_equal(
             mapping_table(),
@@ -1557,7 +1539,7 @@ testthat::describe("srv_teal filters", {
         ),
         expr = {
           testthat::expect_warning(
-            session$setInputs("teal_modules-active_module_id" = "module_1"),
+            session$setInputs(`teal_modules-active_module_id` = "module_1"),
             "Filter 'unknown unavailable' refers to dataname not available in 'data'"
           )
           session$flushReact()
@@ -1593,7 +1575,7 @@ testthat::describe("srv_teal filters", {
         ),
         expr = {
           testthat::expect_warning(
-            session$setInputs("teal_modules-active_module_id" = "module_1"),
+            session$setInputs(`teal_modules-active_module_id` = "module_1"),
             "Filter 'unknown unavailable' refers to dataname not available in 'data'"
           )
           session$flushReact()
@@ -1806,7 +1788,7 @@ testthat::describe("srv_teal teal_module(s) transformator", {
           )
         ),
         expr = {
-          session$setInputs("teal_modules-active_module_id" = "module")
+          session$setInputs(`teal_modules-active_module_id` = "module")
           session$flushReact()
         }
       ),
@@ -1838,7 +1820,7 @@ testthat::describe("srv_teal teal_module(s) transformator", {
             )
           ),
           expr = {
-            session$setInputs("teal_modules-active_module_id" = "module")
+            session$setInputs(`teal_modules-active_module_id` = "module")
             session$flushReact()
           }
         ),
@@ -2086,7 +2068,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
           data.frame(
@@ -2116,7 +2098,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
           data.frame(
@@ -2148,7 +2130,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
           data.frame(
@@ -2181,7 +2163,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
           data.frame(
@@ -2215,7 +2197,7 @@ testthat::describe("srv_teal summary table", {
         filter = teal_slices(teal_slice("a", "name", selected = "a"))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
           data.frame(
@@ -2248,7 +2230,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         slices_global$slices_set(teal_slices(teal_slice("a", "name", selected = "a")))
         session$flushReact()
         testthat::expect_identical(
@@ -2289,7 +2271,7 @@ testthat::describe("srv_teal summary table", {
         )
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
           data.frame(
@@ -2318,7 +2300,7 @@ testthat::describe("srv_teal summary table", {
           )
         ),
         expr = {
-          session$setInputs("teal_modules-active_module_id" = "module_1")
+          session$setInputs(`teal_modules-active_module_id` = "module_1")
           testthat::expect_identical(
             module_summary_table(output, "module_1"),
             data.frame(
@@ -2342,7 +2324,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data, datanames = "iris"))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
           data.frame(
@@ -2372,7 +2354,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         session$flushReact()
         testthat::expect_identical(
           module_summary_table(output, "module_1")[["Data Name"]],
@@ -2392,7 +2374,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data, datanames = c("iris", "iris2")))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         session$flushReact()
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
@@ -2434,7 +2416,7 @@ testthat::describe("srv_teal summary table", {
       ),
       expr = {
         # throws warning as data("miniACC") hasn't been detected as miniACC dependency
-        suppressWarnings(session$setInputs("teal_modules-active_module_id" = "module_1"))
+        suppressWarnings(session$setInputs(`teal_modules-active_module_id` = "module_1"))
         testthat::expect_equal(
           module_summary_table(output, "module_1"),
           data.frame(
@@ -2465,7 +2447,7 @@ testthat::describe("srv_teal summary table", {
         modules = modules(module("module_1", server = function(id, data) data, datanames = "all"))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         session$flushReact()
         testthat::expect_identical(
           module_summary_table(output, "module_1"),
@@ -2499,7 +2481,7 @@ testthat::describe("srv_teal snapshot manager", {
       ),
       expr = {
         initial_slices <- slices_global$all_slices()
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         slices_global$slices_set(teal_slices())
         session$flushReact()
         session$setInputs("snapshot_manager_panel-module-snapshot_reset" = TRUE)
@@ -2540,8 +2522,8 @@ testthat::describe("srv_teal snapshot manager", {
       ),
       expr = {
         initial_slices <- slices_global$all_slices()
-        session$setInputs("teal_modules-active_module_id" = "module_1")
-        session$setInputs("teal_modules-active_module_id" = "module_2")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_2")
         slices_global$slices_set(teal_slices())
         session$flushReact()
         session$setInputs("snapshot_manager_panel-module-snapshot_reset" = TRUE)
@@ -2587,7 +2569,7 @@ testthat::describe("Datanames with special symbols", {
         )
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         session$flushReact()
 
         testthat::expect_setequal(
@@ -2617,7 +2599,7 @@ testthat::describe("Datanames with special symbols", {
         )
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         session$flushReact()
 
         testthat::expect_setequal(
@@ -2650,7 +2632,7 @@ testthat::describe("Datanames with special symbols", {
         )
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         session$flushReact()
 
         testthat::expect_contains(
@@ -2683,7 +2665,7 @@ testthat::describe("teal.data code with a function defined", {
         modules = modules(module("module_1", server = function(id, data) data))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         session$flushReact()
 
         # Need to evaluate characters to preserve indentation
@@ -2715,7 +2697,7 @@ testthat::describe("teal.data code with a function defined", {
         modules = modules(module("module_1", server = function(id, data) data))
       ),
       expr = {
-        session$setInputs("teal_modules-active_module_id" = "module_1")
+        session$setInputs(`teal_modules-active_module_id` = "module_1")
         session$flushReact()
 
         # Need to evaluate characters to preserve indentation
diff --git a/tests/testthat/test-report_previewer_module.R b/tests/testthat/test-report_previewer_module.R
deleted file mode 100644
index dc7e014459..0000000000
--- a/tests/testthat/test-report_previewer_module.R
+++ /dev/null
@@ -1,40 +0,0 @@
-testthat::test_that("report_previewer_module has specific classes", {
-  testthat::expect_s3_class(
-    reporter_previewer_module(),
-    c("teal_module_previewer", "teal_module")
-  )
-})
-
-testthat::test_that("report_previewer_module throws error if label is not string", {
-  testthat::expect_error(
-    reporter_previewer_module(label = 5), "Assertion on 'label' failed: Must be of type 'string'"
-  )
-  testthat::expect_error(
-    reporter_previewer_module(label = c("A", "B")), "Assertion on 'label' failed: Must have length 1."
-  )
-})
-
-testthat::test_that("report_previewer_module throws no error and stores label if label is string", {
-  testthat::expect_no_error(r_p_m <- reporter_previewer_module(label = "My label"))
-  testthat::expect_equal(r_p_m$label, "My label")
-})
-
-testthat::test_that("report_previewer_module default label is Report previewer ", {
-  r_p_m <- reporter_previewer_module()
-  testthat::expect_equal(r_p_m$label, "Report previewer")
-})
-
-testthat::test_that(
-  "report_previewer_module does not accept server_args out of formals(teal.reporter::reporter_previewer_srv) ",
-  {
-    error_pattern <- ".*Assertion on \\'all\\(names\\(server_args"
-    testthat::expect_error(
-      reporter_previewer_module(server_args = list(x = "A")),
-      error_pattern
-    )
-    testthat::expect_error(
-      reporter_previewer_module(server_args = list(reporter = "A", global_knitr = 5, d = 1)),
-      error_pattern
-    )
-  }
-)