diff --git a/R/module-controls-params.R b/R/module-controls-params.R
new file mode 100644
index 00000000..b1a05748
--- /dev/null
+++ b/R/module-controls-params.R
@@ -0,0 +1,327 @@
+
+#' Controls for parameters
+#'
+#' Set bins for histogram, position for barchart, flip coordinates
+#'
+#' @param ns Namespace from module
+#'
+#' @noRd
+#' @importFrom shiny sliderInput conditionalPanel selectInput numericInput
+#' @importFrom htmltools tagList tags
+#' @importFrom shinyWidgets prettyRadioButtons numericRangeInput prettyToggle
+#'
+controls_parameters_ui <- function(id) {
+
+  ns <- NS(id)
+
+  scales_trans <- c(
+    "asn", "atanh", "boxcox", "exp", "identity",
+    "log", "log10", "log1p", "log2", "logit",
+    "probability", "probit", "reciprocal",
+    "reverse", "sqrt"
+  )
+
+  tagList(
+    tags$div(
+      id = ns("controls-scatter"),
+      style = "display: none; padding-top: 10px;",
+      tags$label(
+        class = "control-label",
+        `for` = ns("smooth_add"),
+        i18n("Add a smooth line:")
+      ),
+      prettyToggle(
+        inputId = ns("smooth_add"),
+        label_on = i18n("Yes"),
+        status_on = "success",
+        status_off = "danger",
+        label_off = i18n("No"),
+        inline = TRUE
+      ),
+      conditionalPanel(
+        condition = paste0("input.smooth_add==true"),
+        ns = ns,
+        sliderInput(
+          inputId = ns("smooth_span"),
+          label = i18n("Smooth line span:"),
+          min = 0.1,
+          max = 1,
+          value = 0.75,
+          step = 0.01,
+          width = "100%"
+        )
+      ),
+    ),
+    tags$div(
+      id = ns("controls-jitter"),
+      style = "display: none; padding-top: 10px;",
+      tags$label(
+        class = "control-label",
+        `for` = ns("jitter_add"),
+        i18n("Jittered points:")
+      ),
+      prettyToggle(
+        inputId = ns("jitter_add"),
+        label_on = i18n("Yes"),
+        status_on = "success",
+        status_off = "danger",
+        label_off = i18n("No"),
+        inline = TRUE
+      )
+    ),
+    tags$div(
+      id = ns("controls-size"), style = "display: none;",
+      sliderInput(
+        inputId = ns("size"),
+        label = i18n("Size for points/lines:"),
+        min = 0.5,
+        max = 4,
+        value = 1.2,
+        width = "100%"
+      )
+    ),
+    tags$div(
+      id = ns("controls-facet"), style = "display: none;",
+      prettyRadioButtons(
+        inputId = ns("facet_scales"),
+        label = i18n("Facet scales:"),
+        inline = TRUE,
+        status = "primary",
+        choices = c("fixed", "free", "free_x", "free_y"),
+        outline = TRUE
+      ),
+      sliderInput(
+        inputId = ns("facet_ncol"),
+        label = i18n("Facet ncol:"),
+        min = 0,
+        max = 10,
+        value = 0,
+        step = 1
+      ),
+      sliderInput(
+        inputId = ns("facet_nrow"),
+        label = i18n("Facet nrow:"),
+        min = 0,
+        max = 10,
+        value = 0,
+        step = 1
+      )
+    ),
+    tags$div(
+      id = ns("controls-histogram"), style = "display: none;",
+      sliderInput(
+        inputId = ns("bins"),
+        label = i18n("Numbers of bins:"),
+        min = 10,
+        max = 100,
+        value = 30,
+        width = "100%"
+      )
+    ),
+    tags$div(
+      id = ns("controls-violin"), style = "display: none;",
+      prettyRadioButtons(
+        inputId = ns("scale"),
+        label = i18n("Scale:"),
+        inline = TRUE,
+        status = "primary",
+        choices = c("area", "count", "width"),
+        outline = TRUE
+      )
+    ),
+    tags$div(
+      id = ns("controls-scale-trans-x"), style = "display: none;",
+      numericRangeInput(
+        inputId = ns("xlim"),
+        label = i18n("X-Axis limits (empty for none):"),
+        value = c(NA, NA)
+      ),
+      selectInput(
+        inputId = ns("transX"),
+        label = i18n("X-Axis transform:"),
+        selected = "identity",
+        choices = scales_trans,
+        width = "100%"
+      )
+    ),
+    tags$div(
+      id = ns("controls-scale-trans-y"), style = "display: none;",
+      numericRangeInput(
+        inputId = ns("ylim"),
+        label = i18n("Y-Axis limits (empty for none):"),
+        value = c(NA, NA)
+      ),
+      selectInput(
+        inputId = ns("transY"),
+        label = i18n("Y-Axis transform:"),
+        selected = "identity",
+        choices = scales_trans,
+        width = "100%"
+      )
+    ),
+    tags$div(
+      id = ns("controls-density"),
+      style = "display: none;",
+      sliderInput(
+        inputId = ns("adjust"),
+        label = i18n("Bandwidth adjustment:"),
+        min = 0.2,
+        max = 6,
+        value = 1,
+        step = 0.1,
+        width = "100%"
+      )
+    ),
+    tags$div(
+      id = ns("controls-position"),
+      style = "display: none;",
+      prettyRadioButtons(
+        inputId = ns("position"),
+        label = i18n("Position:"),
+        choices = c("stack", "dodge", "fill"),
+        inline = TRUE,
+        selected = "stack",
+        status = "primary",
+        outline = TRUE
+      )
+    ),
+    tags$label(
+      class = "control-label",
+      `for` = ns("flip"),
+      i18n("Flip coordinate:")
+    ),
+    prettyToggle(
+      inputId = ns("flip"),
+      label_on = i18n("Yes"),
+      status_on = "success",
+      status_off = "danger",
+      label_off = i18n("No"),
+      inline = TRUE
+    )
+  )
+}
+
+
+controls_parameters_server <- function(id,
+                                       use_facet = reactive(FALSE),
+                                       use_transX = reactive(FALSE),
+                                       use_transY = reactive(FALSE),
+                                       type = reactiveValues()) {
+  moduleServer(
+    id = id,
+    function(input, output, session) {
+
+      ns <- session$ns
+
+      observeEvent(use_facet(), {
+        toggleDisplay(id = ns("controls-facet"), display = isTRUE(use_facet()))
+      })
+
+      observeEvent(use_transX(), {
+        toggleDisplay(id = ns("controls-scale-trans-x"), display = isTRUE(use_transX()))
+      })
+
+      observeEvent(use_transY(), {
+        toggleDisplay(id = ns("controls-scale-trans-y"), display = isTRUE(use_transY()))
+      })
+
+
+
+      observeEvent(type$controls, {
+        toggleDisplay(id = ns("controls-position"), display = type$controls %in% c("bar", "line", "area", "histogram"))
+        toggleDisplay(id = ns("controls-histogram"), display = type$controls %in% "histogram")
+        toggleDisplay(id = ns("controls-density"), display = type$controls %in% c("density", "violin"))
+        toggleDisplay(id = ns("controls-scatter"), display = type$controls %in% "point")
+        toggleDisplay(id = ns("controls-size"), display = type$controls %in% c("point", "line", "step", "sf"))
+        toggleDisplay(id = ns("controls-violin"), display = type$controls %in% "violin")
+        toggleDisplay(id = ns("controls-jitter"), display = type$controls %in% c("boxplot", "violin"))
+
+        if (type$controls %in% c("point")) {
+          updateSliderInput(session = session, inputId = "size", value = 1.5)
+        } else if (type$controls %in% c("line", "step")) {
+          updateSliderInput(session = session, inputId = "size", value = 0.5)
+        }
+      })
+
+
+      smooth_r <- reactive({
+        list(
+          add = input$smooth_add,
+          args = list(
+            span = input$smooth_span
+          )
+        )
+      })
+
+      jitter_r <- reactive({
+        list(
+          add = input$jitter_add,
+          args = list()
+        )
+      })
+
+      transX_r <- reactive({
+        list(
+          use = use_transX() & !identical(input$transX, "identity"),
+          args = list(
+            trans = input$transX
+          )
+        )
+      })
+
+      transY_r <- reactive({
+        list(
+          use = use_transY() & !identical(input$transY, "identity"),
+          args = list(
+            trans = input$transY
+          )
+        )
+      })
+
+      coord_r <- reactive(
+        if (isTRUE(input$flip)) "flip" else NULL
+      )
+
+      facet_r <- reactive({
+        list(
+          scales = if (identical(input$facet_scales, "fixed")) NULL else input$facet_scales,
+          ncol = if (is.null(input$facet_ncol) || input$facet_ncol == 0) {
+            NULL
+          } else {
+            input$facet_ncol
+          },
+          nrow = if (is.null(input$facet_ncol) || input$facet_nrow == 0) {
+            NULL
+          } else {
+            input$facet_nrow
+          }
+        )
+      })
+
+      limits_r <- reactive({
+        list(
+          x = use_transX() & !anyNA(input$xlim),
+          xlim = input$xlim,
+          y = use_transY() & !anyNA(input$ylim),
+          ylim = input$ylim
+        )
+      })
+
+      return(list(
+        smooth = smooth_r,
+        coord = coord_r,
+        jitter = jitter_r,
+        transX = transX_r,
+        transY = transY_r,
+        facet = facet_r,
+        limits = limits_r,
+        inputs = reactive({list(
+          position = input$position
+        )})
+      ))
+
+    }
+  )
+}
+
+
diff --git a/R/module-controls.R b/R/module-controls.R
index 15d5ad6d..e855c3a8 100644
--- a/R/module-controls.R
+++ b/R/module-controls.R
@@ -88,7 +88,7 @@ controls_ui <- function(id,
       },
       if (isTRUE("parameters" %in% controls)) {
         dropdown_(
-          controls_params(ns),
+          controls_parameters_ui(ns("parameters")),
           inputId = ns("controls-parameters"),
           class = "esquisse-controls-parameters",
           style = "default",
@@ -204,6 +204,14 @@ controls_server <- function(id,
         type = type
       )
 
+      parameters_r <- controls_parameters_server(
+        id = "parameters",
+        use_facet = use_facet,
+        use_transX = use_transX,
+        use_transY = use_transY,
+        type = type
+      )
+
       # Code ----
       observeEvent(input$insert_code, {
         context <- rstudioapi::getSourceEditorContext()
@@ -242,38 +250,7 @@ controls_server <- function(id,
 
 
 
-      # Controls ----
-
-      observeEvent(use_facet(), {
-        toggleDisplay(id = ns("controls-facet"), display = isTRUE(use_facet()))
-      })
-
-      observeEvent(use_transX(), {
-        toggleDisplay(id = ns("controls-scale-trans-x"), display = isTRUE(use_transX()))
-      })
-
-      observeEvent(use_transY(), {
-        toggleDisplay(id = ns("controls-scale-trans-y"), display = isTRUE(use_transY()))
-      })
-
-
-
-      observeEvent(type$controls, {
-        toggleDisplay(id = ns("controls-position"), display = type$controls %in% c("bar", "line", "area", "histogram"))
-        toggleDisplay(id = ns("controls-histogram"), display = type$controls %in% "histogram")
-        toggleDisplay(id = ns("controls-density"), display = type$controls %in% c("density", "violin"))
-        toggleDisplay(id = ns("controls-scatter"), display = type$controls %in% "point")
-        toggleDisplay(id = ns("controls-size"), display = type$controls %in% c("point", "line", "step", "sf"))
-        toggleDisplay(id = ns("controls-violin"), display = type$controls %in% "violin")
-        toggleDisplay(id = ns("controls-jitter"), display = type$controls %in% c("boxplot", "violin"))
-
-        if (type$controls %in% c("point")) {
-          updateSliderInput(session = session, inputId = "size", value = 1.5)
-        } else if (type$controls %in% c("line", "step")) {
-          updateSliderInput(session = session, inputId = "size", value = 0.5)
-        }
-      })
-
+      # Filter data module from datamods
       output_filter <- filter_data_server(
         id = "filter-data",
         data = reactive({
@@ -320,6 +297,10 @@ controls_server <- function(id,
         outputs$inputs <- modifyList(outputs$inputs, appearance_r$inputs())
       })
 
+      observeEvent(parameters_r$inputs(), {
+        outputs$inputs <- modifyList(outputs$inputs, parameters_r$inputs())
+      })
+
       observeEvent(labs_r$labs(), {
         outputs$labs <- labs_r$labs()
       })
@@ -330,34 +311,6 @@ controls_server <- function(id,
       })
 
 
-      # limits input
-      observe({
-        outputs$limits <- list(
-          x = use_transX() & !anyNA(input$xlim),
-          xlim = input$xlim,
-          y = use_transY() & !anyNA(input$ylim),
-          ylim = input$ylim
-        )
-      })
-
-
-      # facet input
-      observe({
-        outputs$facet <- list(
-          scales = if (identical(input$facet_scales, "fixed")) NULL else input$facet_scales,
-          ncol = if (is.null(input$facet_ncol) || input$facet_ncol == 0) {
-            NULL
-          } else {
-            input$facet_ncol
-          },
-          nrow = if (is.null(input$facet_ncol) || input$facet_nrow == 0) {
-            NULL
-          } else {
-            input$facet_nrow
-          }
-        )
-      })
-
       # theme input
       observe({
         theme_labs <- labs_r$theme()
@@ -379,46 +332,38 @@ controls_server <- function(id,
       })
 
       # coord input
-      observe({
-        outputs$coord <- if (isTRUE(input$flip)) "flip" else NULL
-      })
+      observeEvent(parameters_r$coord(), {
+        outputs$coord <- parameters_r$coord()
+      }, ignoreNULL = FALSE)
 
       # smooth input
-      observe({
-        outputs$smooth <- list(
-          add = input$smooth_add,
-          args = list(
-            span = input$smooth_span
-          )
-        )
+      observeEvent(parameters_r$smooth(), {
+        outputs$smooth <- parameters_r$smooth()
       })
 
       # jittered input
-      observe({
-        outputs$jitter <- list(
-          add = input$jitter_add,
-          args = list()
-        )
+      observeEvent(parameters_r$jitter(), {
+        outputs$jitter <- parameters_r$jitter()
       })
 
       # transX input
-      observe({
-        outputs$transX <- list(
-          use = use_transX() & !identical(input$transX, "identity"),
-          args = list(
-            trans = input$transX
-          )
-        )
+      observeEvent(parameters_r$transX(), {
+        outputs$transX <- parameters_r$transX()
       })
 
       # transY input
-      observe({
-        outputs$transY <- list(
-          use = use_transY() & !identical(input$transY, "identity"),
-          args = list(
-            trans = input$transY
-          )
-        )
+      observeEvent(parameters_r$transY(), {
+        outputs$transY <- parameters_r$transY()
+      })
+
+      # facet input
+      observeEvent(parameters_r$facet(), {
+        outputs$facet <- parameters_r$facet()
+      })
+
+      # limits input
+      observeEvent(parameters_r$limits(), {
+        outputs$limits <- parameters_r$limits()
       })
 
       observeEvent(output_filter$filtered(), {
@@ -438,205 +383,7 @@ controls_server <- function(id,
 
 
 
-#' Controls for parameters
-#'
-#' Set bins for histogram, position for barchart, flip coordinates
-#'
-#' @param ns Namespace from module
-#'
-#' @noRd
-#' @importFrom shiny sliderInput conditionalPanel selectInput numericInput
-#' @importFrom htmltools tagList tags
-#' @importFrom shinyWidgets prettyRadioButtons numericRangeInput prettyToggle
-#'
-controls_params <- function(ns) {
-
-  scales_trans <- c(
-    "asn", "atanh", "boxcox", "exp", "identity",
-    "log", "log10", "log1p", "log2", "logit",
-    "probability", "probit", "reciprocal",
-    "reverse", "sqrt"
-  )
 
-  tagList(
-    tags$div(
-      id = ns("controls-scatter"),
-      style = "display: none; padding-top: 10px;",
-      tags$label(
-        class = "control-label",
-        `for` = ns("smooth_add"),
-        i18n("Add a smooth line:")
-      ),
-      prettyToggle(
-        inputId = ns("smooth_add"),
-        label_on = i18n("Yes"),
-        status_on = "success",
-        status_off = "danger",
-        label_off = i18n("No"),
-        inline = TRUE
-      ),
-      conditionalPanel(
-        condition = paste0("input.smooth_add==true"),
-        ns = ns,
-        sliderInput(
-          inputId = ns("smooth_span"),
-          label = i18n("Smooth line span:"),
-          min = 0.1,
-          max = 1,
-          value = 0.75,
-          step = 0.01,
-          width = "100%"
-        )
-      ),
-    ),
-    tags$div(
-      id = ns("controls-jitter"),
-      style = "display: none; padding-top: 10px;",
-      tags$label(
-        class = "control-label",
-        `for` = ns("jitter_add"),
-        i18n("Jittered points:")
-      ),
-      prettyToggle(
-        inputId = ns("jitter_add"),
-        label_on = i18n("Yes"),
-        status_on = "success",
-        status_off = "danger",
-        label_off = i18n("No"),
-        inline = TRUE
-      )
-    ),
-    tags$div(
-      id = ns("controls-size"), style = "display: none;",
-      sliderInput(
-        inputId = ns("size"),
-        label = i18n("Size for points/lines:"),
-        min = 0.5,
-        max = 4,
-        value = 1.2,
-        width = "100%"
-      )
-    ),
-    tags$div(
-      id = ns("controls-facet"), style = "display: none;",
-      prettyRadioButtons(
-        inputId = ns("facet_scales"),
-        label = i18n("Facet scales:"),
-        inline = TRUE,
-        status = "primary",
-        choices = c("fixed", "free", "free_x", "free_y"),
-        outline = TRUE
-      ),
-      sliderInput(
-        inputId = ns("facet_ncol"),
-        label = i18n("Facet ncol:"),
-        min = 0,
-        max = 10,
-        value = 0,
-        step = 1
-      ),
-      sliderInput(
-        inputId = ns("facet_nrow"),
-        label = i18n("Facet nrow:"),
-        min = 0,
-        max = 10,
-        value = 0,
-        step = 1
-      )
-    ),
-    tags$div(
-      id = ns("controls-histogram"), style = "display: none;",
-      sliderInput(
-        inputId = ns("bins"),
-        label = i18n("Numbers of bins:"),
-        min = 10,
-        max = 100,
-        value = 30,
-        width = "100%"
-      )
-    ),
-    tags$div(
-      id = ns("controls-violin"), style = "display: none;",
-      prettyRadioButtons(
-        inputId = ns("scale"),
-        label = i18n("Scale:"),
-        inline = TRUE,
-        status = "primary",
-        choices = c("area", "count", "width"),
-        outline = TRUE
-      )
-    ),
-    tags$div(
-      id = ns("controls-scale-trans-x"), style = "display: none;",
-      numericRangeInput(
-        inputId = ns("xlim"),
-        label = i18n("X-Axis limits (empty for none):"),
-        value = c(NA, NA)
-      ),
-      selectInput(
-        inputId = ns("transX"),
-        label = i18n("X-Axis transform:"),
-        selected = "identity",
-        choices = scales_trans,
-        width = "100%"
-      )
-    ),
-    tags$div(
-      id = ns("controls-scale-trans-y"), style = "display: none;",
-      numericRangeInput(
-        inputId = ns("ylim"),
-        label = i18n("Y-Axis limits (empty for none):"),
-        value = c(NA, NA)
-      ),
-      selectInput(
-        inputId = ns("transY"),
-        label = i18n("Y-Axis transform:"),
-        selected = "identity",
-        choices = scales_trans,
-        width = "100%"
-      )
-    ),
-    tags$div(
-      id = ns("controls-density"),
-      style = "display: none;",
-      sliderInput(
-        inputId = ns("adjust"),
-        label = i18n("Bandwidth adjustment:"),
-        min = 0.2,
-        max = 6,
-        value = 1,
-        step = 0.1,
-        width = "100%"
-      )
-    ),
-    tags$div(
-      id = ns("controls-position"),
-      style = "display: none;",
-      prettyRadioButtons(
-        inputId = ns("position"),
-        label = i18n("Position:"),
-        choices = c("stack", "dodge", "fill"),
-        inline = TRUE,
-        selected = "stack",
-        status = "primary",
-        outline = TRUE
-      )
-    ),
-    tags$label(
-      class = "control-label",
-      `for` = ns("flip"),
-      i18n("Flip coordinate:")
-    ),
-    prettyToggle(
-      inputId = ns("flip"),
-      label_on = i18n("Yes"),
-      status_on = "success",
-      status_off = "danger",
-      label_off = i18n("No"),
-      inline = TRUE
-    )
-  )
-}
 
 
 #' Controls for code and export