diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/At-risk_learners.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/At-risk_learners.yaml
index 7c0a34bd5..025ed9ef3 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/At-risk_learners.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/At-risk_learners.yaml
@@ -14,45 +14,16 @@ params:
   - name
   - username
   - email
-  - expressionType: SQL
-    label: Course Grade %
-    sqlExpression: round(course_grade*100, 2)
-  - last_visited
   order_by_cols: []
   order_desc: true
   percent_metrics: []
   query_mode: aggregate
-  row_limit: 5000
+  row_limit: 1000
   server_page_length: 10
   show_cell_bars: true
   table_timestamp_format: smart_date
   temporal_columns_lookup: {}
   time_grain_sqla: P1D
-  timeseries_limit_metric:
-    aggregate: MAX
-    column:
-      advanced_data_type: null
-      certification_details: null
-      certified_by: null
-      column_name: course_grade
-      description: null
-      expression: null
-      filterable: true
-      groupby: true
-      id: 10990
-      is_certified: false
-      is_dttm: false
-      python_date_format: null
-      type: Float64
-      type_generic: 0
-      verbose_name: Course Grade
-      warning_markdown: null
-    datasourceWarning: false
-    expressionType: SIMPLE
-    hasCustomLabel: false
-    label: MAX(Course Grade)
-    optionName: metric_0woj6b3chi2_ihsomqnfpk9
-    sqlExpression: null
   viz_type: table
 query_context:
   datasource:
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information.yaml
index c3f7aff1c..8afa02ed2 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information.yaml
@@ -7,7 +7,6 @@ description: null
 params:
   adhoc_filters: []
   all_columns: []
-  annotation_layers: []
   color_pn: true
   column_config:
     Avg Course Grade:
@@ -54,7 +53,6 @@ params:
   - course_name
   - course_run
   metrics:
-  - graded_learners
   - avg_course_grade
   - median_course_grade
   order_by_cols: []
@@ -70,7 +68,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 282
+    id: 54
     type: table
   force: false
   form_data:
@@ -89,9 +87,35 @@ query_context:
       column: graded_learners
       operator: '>'
       targetValue: 0
+    - colorScheme: '#FDE380'
+      column: avg_course_grade
+      operator: "\u2264 x \u2264"
+      targetValueLeft: '50'
+      targetValueRight: '70'
+    - colorScheme: '#EFA1AA'
+      column: avg_course_grade
+      operator: <
+      targetValue: 50
+    - colorScheme: '#ACE1C4'
+      column: avg_course_grade
+      operator: "\u2265"
+      targetValue: 70
+    - colorScheme: '#ACE1C4'
+      column: median_course_grade
+      operator: "\u2265"
+      targetValue: 70
+    - colorScheme: '#FDE380'
+      column: median_course_grade
+      operator: "\u2264 x \u2264"
+      targetValueLeft: '50'
+      targetValueRight: '70'
+    - colorScheme: '#EFA1AA'
+      column: median_course_grade
+      operator: <
+      targetValue: 50
     dashboards:
-    - 629
-    datasource: 282__table
+    - 9
+    datasource: 54__table
     extra_form_data: {}
     force: false
     groupby:
@@ -100,7 +124,6 @@ query_context:
     - course_name
     - course_run
     metrics:
-    - graded_learners
     - avg_course_grade
     - median_course_grade
     order_by_cols: []
@@ -112,7 +135,7 @@ query_context:
     row_limit: 1000
     server_page_length: 10
     show_cell_bars: true
-    slice_id: 528
+    slice_id: 193
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     time_grain_sqla: P1D
@@ -133,12 +156,11 @@ query_context:
       where: ''
     filters: []
     metrics:
-    - graded_learners
     - avg_course_grade
     - median_course_grade
     order_desc: true
     orderby:
-    - - graded_learners
+    - - avg_course_grade
       - false
     post_processing: []
     row_limit: 1000
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Cumulative_Interactions.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Cumulative_Interactions.yaml
index 92da29529..80c9a372c 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Cumulative_Interactions.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Cumulative_Interactions.yaml
@@ -2,7 +2,7 @@ _file_name: Cumulative_Interactions.yaml
 cache_timeout: null
 certification_details: null
 certified_by: null
-dataset_uuid: 1b1cbf0a-1193-4251-ad52-724c2f0190ae
+dataset_uuid: 649ad1d3-c0b4-48e1-a02b-e1d1e80c94ac
 description: null
 params:
   adhoc_filters:
@@ -18,11 +18,10 @@ params:
   forecastInterval: 0.8
   forecastPeriods: 10
   groupby: []
-  legendMargin: null
   legendOrientation: top
   legendType: scroll
   markerEnabled: true
-  markerSize: 7
+  markerSize: 6
   metrics:
   - views
   - number_of_learners
@@ -31,19 +30,18 @@ params:
   order_desc: true
   rich_tooltip: true
   rolling_type: cumsum
-  row_limit: 1000
+  row_limit: 10000
   seriesType: line
   show_empty_columns: true
   show_legend: true
-  show_value: false
   sort_series_ascending: true
   sort_series_type: sum
   time_grain_sqla: P1M
   tooltipTimeFormat: smart_date
+  truncateXAxis: true
   truncate_metric: true
   viz_type: echarts_timeseries_line
   x_axis: visited_on
-  x_axis_sort: Views
   x_axis_sort_asc: true
   x_axis_sort_series: name
   x_axis_sort_series_ascending: true
@@ -58,7 +56,7 @@ params:
   zoomable: true
 query_context:
   datasource:
-    id: 61
+    id: 89
     type: table
   force: false
   form_data:
@@ -72,18 +70,17 @@ query_context:
     color_scheme: supersetColors
     comparison_type: values
     dashboards:
-    - 629
-    datasource: 61__table
+    - 19
+    datasource: 89__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
     forecastPeriods: 10
     groupby: []
-    legendMargin: null
     legendOrientation: top
     legendType: scroll
     markerEnabled: true
-    markerSize: 7
+    markerSize: 6
     metrics:
     - views
     - number_of_learners
@@ -94,12 +91,11 @@ query_context:
     result_type: full
     rich_tooltip: true
     rolling_type: cumsum
-    row_limit: 1000
+    row_limit: 10000
     seriesType: line
     show_empty_columns: true
     show_legend: true
-    show_value: false
-    slice_id: 140
+    slice_id: 162
     sort_series_ascending: true
     sort_series_type: sum
     time_grain_sqla: P1M
@@ -107,9 +103,7 @@ query_context:
     truncateXAxis: true
     truncate_metric: true
     viz_type: echarts_timeseries_line
-    xAxisForceCategorical: true
     x_axis: visited_on
-    x_axis_sort: Views
     x_axis_sort_asc: true
     x_axis_sort_series: name
     x_axis_sort_series_ascending: true
@@ -167,7 +161,7 @@ query_context:
           views: views
         operator: sum
     - operation: flatten
-    row_limit: 1000
+    row_limit: 10000
     series_columns: []
     series_limit: 0
     time_offsets: []
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Current_Course_Grade.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Current_Course_Grade.yaml
index f8271435a..f1fbf05f8 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Current_Course_Grade.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Current_Course_Grade.yaml
@@ -13,6 +13,7 @@ params:
   forecastInterval: 0.8
   forecastPeriods: 10
   groupby: []
+  legendMargin: null
   legendOrientation: top
   legendType: scroll
   metrics:
@@ -24,7 +25,7 @@ params:
   row_limit: 10000
   show_empty_columns: true
   show_legend: true
-  show_value: true
+  show_value: false
   sort_series_type: sum
   tooltipTimeFormat: smart_date
   truncateXAxis: true
@@ -45,7 +46,7 @@ params:
   y_axis_title_position: Left
 query_context:
   datasource:
-    id: 282
+    id: 54
     type: table
   force: false
   form_data:
@@ -54,13 +55,14 @@ query_context:
     color_scheme: supersetColors
     comparison_type: values
     dashboards:
-    - 629
-    datasource: 282__table
+    - 9
+    datasource: 54__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
     forecastPeriods: 10
     groupby: []
+    legendMargin: null
     legendOrientation: top
     legendType: scroll
     metrics:
@@ -74,8 +76,8 @@ query_context:
     row_limit: 10000
     show_empty_columns: true
     show_legend: true
-    show_value: true
-    slice_id: 532
+    show_value: false
+    slice_id: 95
     sort_series_type: sum
     tooltipTimeFormat: smart_date
     truncateXAxis: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_per_Enrollment_Track.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_per_Enrollment_Track.yaml
index 8fbf6c46d..a6973d638 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_per_Enrollment_Track.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_per_Enrollment_Track.yaml
@@ -47,7 +47,7 @@ params:
   row_limit: 100
   show_empty_columns: true
   show_legend: true
-  show_value: true
+  show_value: false
   sort_series_type: sum
   tooltipTimeFormat: smart_date
   truncateXAxis: true
@@ -67,7 +67,7 @@ params:
   y_axis_title_position: Left
 query_context:
   datasource:
-    id: 424
+    id: 29
     type: table
   force: false
   form_data:
@@ -98,8 +98,8 @@ query_context:
     color_scheme: supersetColors
     comparison_type: values
     dashboards:
-    - 629
-    datasource: 424__table
+    - 9
+    datasource: 29__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -119,8 +119,8 @@ query_context:
     row_limit: 100
     show_empty_columns: true
     show_legend: true
-    show_value: true
-    slice_id: 120
+    show_value: false
+    slice_id: 41
     sort_series_type: sum
     tooltipTimeFormat: smart_date
     truncateXAxis: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Summary.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Summary.yaml
index c8bf89029..4d983cbab 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Summary.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Summary.yaml
@@ -54,9 +54,7 @@ params:
   - expressionType: SQL
     label: Grade Range
     sqlExpression: grade_bucket
-  - expressionType: SQL
-    label: Course Grade %
-    sqlExpression: ROUND(course_grade*100, 2)
+  - course_grade
   order_by_cols: []
   order_desc: true
   percent_metrics: []
@@ -74,7 +72,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 992
+    id: 79
     type: table
   force: false
   form_data:
@@ -101,7 +99,7 @@ query_context:
       column: course_grade
       operator: <
       targetValue: 0.5
-    datasource: 992__table
+    datasource: 79__table
     extra_form_data: {}
     force: false
     groupby:
@@ -136,7 +134,7 @@ query_context:
     server_pagination: true
     show_cell_bars: true
     show_totals: true
-    slice_id: 4364
+    slice_id: 169
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       emission_time: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_views_per_section_subsection.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_views_per_section_subsection.yaml
index 8e4992abe..3f9434212 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_views_per_section_subsection.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_views_per_section_subsection.yaml
@@ -38,10 +38,7 @@ params:
   truncate_metric: true
   viz_type: echarts_timeseries_bar
   xAxisLabelRotation: 0
-  x_axis:
-    expressionType: SQL
-    label: section_subsection_name
-    sqlExpression: section_subsection_name
+  x_axis: section_subsection_name
   x_axis_sort_asc: true
   x_axis_sort_series: name
   x_axis_sort_series_ascending: true
@@ -51,13 +48,13 @@ params:
   - null
   - null
   y_axis_format: ',d'
-  y_axis_title: Number of learners
+  y_axis_title: Number of Learners
   y_axis_title_margin: 30
   y_axis_title_position: Left
   zoomable: true
 query_context:
   datasource:
-    id: 30
+    id: 6
     type: table
   force: false
   form_data:
@@ -71,9 +68,8 @@ query_context:
     color_scheme: supersetColors
     comparison_type: values
     dashboards:
-    - 65
-    - 67
-    datasource: 30__table
+    - 9
+    datasource: 6__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -94,7 +90,7 @@ query_context:
     show_empty_columns: true
     show_legend: true
     show_value: false
-    slice_id: 60
+    slice_id: 194
     sort_series_type: sum
     time_grain_sqla: P1M
     tooltipTimeFormat: smart_date
@@ -102,10 +98,7 @@ query_context:
     truncate_metric: true
     viz_type: echarts_timeseries_bar
     xAxisLabelRotation: 0
-    x_axis:
-      expressionType: SQL
-      label: section_subsection_name
-      sqlExpression: section_subsection_name
+    x_axis: section_subsection_name
     x_axis_sort_asc: true
     x_axis_sort_series: name
     x_axis_sort_series_ascending: true
@@ -115,7 +108,7 @@ query_context:
     - null
     - null
     y_axis_format: ',d'
-    y_axis_title: Number of learners
+    y_axis_title: Number of Learners
     y_axis_title_margin: 30
     y_axis_title_position: Left
     zoomable: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_views_per_subsection.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_views_per_subsection.yaml
index d83f2fa88..8daef5d13 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_views_per_subsection.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Page_views_per_subsection.yaml
@@ -41,7 +41,7 @@ params:
   extra_form_data: {}
   groupby:
   - expressionType: SQL
-    label: Subsection Name
+    label: Subsection Location and Name
     sqlExpression: section_subsection_name
   metrics:
   - all_pages_viewed
@@ -59,7 +59,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 30
+    id: 6
     type: table
   force: false
   form_data:
@@ -97,13 +97,13 @@ query_context:
       operator: '>'
       targetValue: 0
     dashboards:
-    - 65
-    datasource: 30__table
+    - 21
+    datasource: 6__table
     extra_form_data: {}
     force: false
     groupby:
     - expressionType: SQL
-      label: Subsection Name
+      label: Subsection Location and Name
       sqlExpression: section_subsection_name
     metrics:
     - all_pages_viewed
@@ -117,7 +117,7 @@ query_context:
     row_limit: 10000
     server_page_length: 10
     show_cell_bars: true
-    slice_id: 25
+    slice_id: 192
     table_timestamp_format: smart_date
     temporal_columns_lookup: {}
     time_grain_sqla: P1M
@@ -127,7 +127,7 @@ query_context:
     applied_time_extras: {}
     columns:
     - expressionType: SQL
-      label: Subsection Name
+      label: Subsection Location and Name
       sqlExpression: section_subsection_name
     custom_form_data: {}
     custom_params: {}
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results.yaml
index 0f4032d6d..a7542b37b 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_Results.yaml
@@ -53,7 +53,7 @@ params:
   - correct_percent
   - incorrect_percent
   order_by_cols: []
-  order_desc: true
+  order_desc: false
   percent_metrics: []
   query_mode: aggregate
   row_limit: 1000
@@ -65,10 +65,35 @@ params:
   temporal_columns_lookup:
     emission_time: true
   time_grain_sqla: P1M
+  timeseries_limit_metric:
+    aggregate: AVG
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: course_order
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 1348
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: Int32
+      type_generic: 0
+      verbose_name: null
+      warning_markdown: null
+    datasourceWarning: false
+    expressionType: SIMPLE
+    hasCustomLabel: false
+    label: AVG(course_order)
+    optionName: metric_cq2cm641ll8_pcu3pmwa32m
+    sqlExpression: null
   viz_type: table
 query_context:
   datasource:
-    id: 29
+    id: 34
     type: table
   force: false
   form_data:
@@ -106,9 +131,8 @@ query_context:
       operator: "\u2265"
       targetValue: 0
     dashboards:
-    - 65
-    - 67
-    datasource: 29__table
+    - 21
+    datasource: 34__table
     extra_form_data: {}
     force: false
     groupby:
@@ -125,7 +149,7 @@ query_context:
     - correct_percent
     - incorrect_percent
     order_by_cols: []
-    order_desc: true
+    order_desc: false
     percent_metrics: []
     query_mode: aggregate
     result_format: json
@@ -135,11 +159,36 @@ query_context:
     server_pagination: false
     show_cell_bars: true
     show_totals: false
-    slice_id: 55
+    slice_id: 92
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       emission_time: true
     time_grain_sqla: P1M
+    timeseries_limit_metric:
+      aggregate: AVG
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: course_order
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 1348
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: Int32
+        type_generic: 0
+        verbose_name: null
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: AVG(course_order)
+      optionName: metric_cq2cm641ll8_pcu3pmwa32m
+      sqlExpression: null
     viz_type: table
   queries:
   - annotation_layers: []
@@ -167,13 +216,61 @@ query_context:
     - incorrect_attempts
     - correct_percent
     - incorrect_percent
-    order_desc: true
+    order_desc: false
     orderby:
-    - - correct_attempts
-      - false
+    - - aggregate: AVG
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: course_order
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 1348
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: Int32
+          type_generic: 0
+          verbose_name: null
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: false
+        label: AVG(course_order)
+        optionName: metric_cq2cm641ll8_pcu3pmwa32m
+        sqlExpression: null
+      - true
     post_processing: []
     row_limit: 1000
     series_limit: 0
+    series_limit_metric:
+      aggregate: AVG
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: course_order
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 1348
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: Int32
+        type_generic: 0
+        verbose_name: null
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: AVG(course_order)
+      optionName: metric_cq2cm641ll8_pcu3pmwa32m
+      sqlExpression: null
     url_params: {}
   result_format: json
   result_type: full
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_interactions.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_interactions.yaml
index 1cb826110..7728aa366 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_interactions.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problem_interactions.yaml
@@ -31,8 +31,8 @@ params:
   conditional_formatting:
   - colorScheme: '#ACE1C4'
     column: avg_attemps
-    operator: '='
-    targetValue: 1
+    operator: <
+    targetValue: 2
   - colorScheme: '#FDE380'
     column: avg_attemps
     operator: "\u2264 x \u2264"
@@ -69,7 +69,7 @@ params:
   - median_attemps
   - avg_attemps
   order_by_cols: []
-  order_desc: true
+  order_desc: false
   percent_metrics: []
   query_mode: aggregate
   row_limit: 1000
@@ -79,10 +79,36 @@ params:
   temporal_columns_lookup:
     emission_time: true
   time_grain_sqla: P1M
+  timeseries_limit_metric:
+    aggregate: AVG
+    column:
+      advanced_data_type: null
+      changed_on: '2024-05-23T00:19:51'
+      column_name: course_order
+      created_on: '2024-05-23T00:19:51'
+      description: null
+      expression: null
+      extra: '{}'
+      filterable: true
+      groupby: true
+      id: 1348
+      is_active: true
+      is_dttm: false
+      python_date_format: null
+      type: Int32
+      type_generic: 0
+      uuid: d09b858c-5a09-47a2-b290-84d1fce37c7a
+      verbose_name: null
+    datasourceWarning: false
+    expressionType: SIMPLE
+    hasCustomLabel: false
+    label: AVG(course_order)
+    optionName: metric_fy7mao4qznk_sumf5x11o8i
+    sqlExpression: null
   viz_type: table
 query_context:
   datasource:
-    id: 29
+    id: 34
     type: table
   force: false
   form_data:
@@ -112,8 +138,8 @@ query_context:
     conditional_formatting:
     - colorScheme: '#ACE1C4'
       column: avg_attemps
-      operator: '='
-      targetValue: 1
+      operator: <
+      targetValue: 2
     - colorScheme: '#FDE380'
       column: avg_attemps
       operator: "\u2264 x \u2264"
@@ -137,8 +163,8 @@ query_context:
       operator: '>'
       targetValue: 5
     dashboards:
-    - 67
-    datasource: 29__table
+    - 9
+    datasource: 34__table
     extra_form_data: {}
     force: false
     groupby:
@@ -154,7 +180,7 @@ query_context:
     - median_attemps
     - avg_attemps
     order_by_cols: []
-    order_desc: true
+    order_desc: false
     percent_metrics: []
     query_mode: aggregate
     result_format: json
@@ -162,11 +188,37 @@ query_context:
     row_limit: 1000
     server_page_length: 10
     show_cell_bars: true
-    slice_id: 29
+    slice_id: 198
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       emission_time: true
     time_grain_sqla: P1M
+    timeseries_limit_metric:
+      aggregate: AVG
+      column:
+        advanced_data_type: null
+        changed_on: '2024-05-23T00:19:51'
+        column_name: course_order
+        created_on: '2024-05-23T00:19:51'
+        description: null
+        expression: null
+        extra: '{}'
+        filterable: true
+        groupby: true
+        id: 1348
+        is_active: true
+        is_dttm: false
+        python_date_format: null
+        type: Int32
+        type_generic: 0
+        uuid: d09b858c-5a09-47a2-b290-84d1fce37c7a
+        verbose_name: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: AVG(course_order)
+      optionName: metric_fy7mao4qznk_sumf5x11o8i
+      sqlExpression: null
     viz_type: table
   queries:
   - annotation_layers: []
@@ -193,13 +245,63 @@ query_context:
     - number_of_learners
     - median_attemps
     - avg_attemps
-    order_desc: true
+    order_desc: false
     orderby:
-    - - number_of_learners
-      - false
+    - - aggregate: AVG
+        column:
+          advanced_data_type: null
+          changed_on: '2024-05-23T00:19:51'
+          column_name: course_order
+          created_on: '2024-05-23T00:19:51'
+          description: null
+          expression: null
+          extra: '{}'
+          filterable: true
+          groupby: true
+          id: 1348
+          is_active: true
+          is_dttm: false
+          python_date_format: null
+          type: Int32
+          type_generic: 0
+          uuid: d09b858c-5a09-47a2-b290-84d1fce37c7a
+          verbose_name: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: false
+        label: AVG(course_order)
+        optionName: metric_fy7mao4qznk_sumf5x11o8i
+        sqlExpression: null
+      - true
     post_processing: []
     row_limit: 1000
     series_limit: 0
+    series_limit_metric:
+      aggregate: AVG
+      column:
+        advanced_data_type: null
+        changed_on: '2024-05-23T00:19:51'
+        column_name: course_order
+        created_on: '2024-05-23T00:19:51'
+        description: null
+        expression: null
+        extra: '{}'
+        filterable: true
+        groupby: true
+        id: 1348
+        is_active: true
+        is_dttm: false
+        python_date_format: null
+        type: Int32
+        type_generic: 0
+        uuid: d09b858c-5a09-47a2-b290-84d1fce37c7a
+        verbose_name: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: AVG(course_order)
+      optionName: metric_fy7mao4qznk_sumf5x11o8i
+      sqlExpression: null
     url_params: {}
   result_format: json
   result_type: full
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problems_attempted_per_section_subsection.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problems_attempted_per_section_subsection.yaml
index fa505abcb..64584f48a 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problems_attempted_per_section_subsection.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Problems_attempted_per_section_subsection.yaml
@@ -54,13 +54,13 @@ params:
   - null
   - null
   y_axis_format: ',d'
-  y_axis_title: Number of learners
+  y_axis_title: Number of Learners
   y_axis_title_margin: 30
   y_axis_title_position: Left
   zoomable: true
 query_context:
   datasource:
-    id: 11
+    id: 75
     type: table
   force: false
   form_data:
@@ -80,9 +80,8 @@ query_context:
     color_scheme: supersetColors
     comparison_type: values
     dashboards:
-    - 65
-    - 67
-    datasource: 11__table
+    - 9
+    datasource: 75__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -103,7 +102,7 @@ query_context:
     show_empty_columns: true
     show_legend: true
     show_value: false
-    slice_id: 21
+    slice_id: 22
     sort_series_type: sum
     time_grain_sqla: P1M
     tooltipTimeFormat: smart_date
@@ -121,7 +120,7 @@ query_context:
     - null
     - null
     y_axis_format: ',d'
-    y_axis_title: Number of learners
+    y_axis_title: Number of Learners
     y_axis_title_margin: 30
     y_axis_title_position: Left
     zoomable: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Section_Summary.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Section_Summary.yaml
index ab6c842d7..5d9796398 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Section_Summary.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Section_Summary.yaml
@@ -2,7 +2,7 @@ _file_name: Section_Summary.yaml
 cache_timeout: null
 certification_details: null
 certified_by: null
-dataset_uuid: 1b1cbf0a-1193-4251-ad52-724c2f0190ae
+dataset_uuid: 649ad1d3-c0b4-48e1-a02b-e1d1e80c94ac
 description: null
 params:
   adhoc_filters:
@@ -12,17 +12,16 @@ params:
     operator: TEMPORAL_RANGE
     subject: visited_on
   all_columns: []
-  annotation_layers: []
   color_pn: true
   conditional_formatting:
   - colorScheme: '#ACE1C4'
     column: number_of_learners
     operator: "\u2265"
-    targetValue: 1
+    targetValue: 0
   - colorScheme: '#ACE1C4'
     column: views
     operator: "\u2265"
-    targetValue: 1
+    targetValue: 0
   extra_form_data: {}
   groupby:
   - section_with_name
@@ -40,10 +39,36 @@ params:
   temporal_columns_lookup:
     visited_on: true
   time_grain_sqla: P1D
+  timeseries_limit_metric:
+    aggregate: AVG
+    column:
+      advanced_data_type: null
+      changed_on: '2024-05-24T16:02:07'
+      column_name: course_order
+      created_on: '2024-05-24T16:02:07'
+      description: null
+      expression: null
+      extra: '{}'
+      filterable: true
+      groupby: true
+      id: 1354
+      is_active: true
+      is_dttm: false
+      python_date_format: null
+      type: Int32
+      type_generic: 0
+      uuid: e8587f60-b3e2-45e6-abb8-edc64410ba31
+      verbose_name: null
+    datasourceWarning: false
+    expressionType: SIMPLE
+    hasCustomLabel: false
+    label: AVG(course_order)
+    optionName: metric_55fgihnunvg_wqxqn77c8ic
+    sqlExpression: null
   viz_type: table
 query_context:
   datasource:
-    id: 61
+    id: 89
     type: table
   force: false
   form_data:
@@ -59,14 +84,14 @@ query_context:
     - colorScheme: '#ACE1C4'
       column: Number of Learners
       operator: "\u2265"
-      targetValue: 1
+      targetValue: 0
     - colorScheme: '#ACE1C4'
       column: Views
       operator: "\u2265"
-      targetValue: 1
+      targetValue: 0
     dashboards:
-    - 629
-    datasource: 61__table
+    - 19
+    datasource: 89__table
     extra_form_data: {}
     force: false
     groupby:
@@ -83,11 +108,37 @@ query_context:
     row_limit: 1000
     server_page_length: 10
     show_cell_bars: true
-    slice_id: 503
+    slice_id: 177
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       visited_on: true
     time_grain_sqla: P1D
+    timeseries_limit_metric:
+      aggregate: AVG
+      column:
+        advanced_data_type: null
+        changed_on: '2024-05-24T16:02:07'
+        column_name: course_order
+        created_on: '2024-05-24T16:02:07'
+        description: null
+        expression: null
+        extra: '{}'
+        filterable: true
+        groupby: true
+        id: 1354
+        is_active: true
+        is_dttm: false
+        python_date_format: null
+        type: Int32
+        type_generic: 0
+        uuid: e8587f60-b3e2-45e6-abb8-edc64410ba31
+        verbose_name: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: AVG(course_order)
+      optionName: metric_55fgihnunvg_wqxqn77c8ic
+      sqlExpression: null
     viz_type: table
   queries:
   - annotation_layers: []
@@ -109,11 +160,61 @@ query_context:
     - views
     order_desc: true
     orderby:
-    - - number_of_learners
+    - - aggregate: AVG
+        column:
+          advanced_data_type: null
+          changed_on: '2024-05-24T16:02:07'
+          column_name: course_order
+          created_on: '2024-05-24T16:02:07'
+          description: null
+          expression: null
+          extra: '{}'
+          filterable: true
+          groupby: true
+          id: 1354
+          is_active: true
+          is_dttm: false
+          python_date_format: null
+          type: Int32
+          type_generic: 0
+          uuid: e8587f60-b3e2-45e6-abb8-edc64410ba31
+          verbose_name: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: false
+        label: AVG(course_order)
+        optionName: metric_55fgihnunvg_wqxqn77c8ic
+        sqlExpression: null
       - false
     post_processing: []
     row_limit: 1000
     series_limit: 0
+    series_limit_metric:
+      aggregate: AVG
+      column:
+        advanced_data_type: null
+        changed_on: '2024-05-24T16:02:07'
+        column_name: course_order
+        created_on: '2024-05-24T16:02:07'
+        description: null
+        expression: null
+        extra: '{}'
+        filterable: true
+        groupby: true
+        id: 1354
+        is_active: true
+        is_dttm: false
+        python_date_format: null
+        type: Int32
+        type_generic: 0
+        uuid: e8587f60-b3e2-45e6-abb8-edc64410ba31
+        verbose_name: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: AVG(course_order)
+      optionName: metric_55fgihnunvg_wqxqn77c8ic
+      sqlExpression: null
     url_params: {}
   result_format: json
   result_type: full
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Subsection_Summary.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Subsection_Summary.yaml
index 18886bcf4..39f0db3c2 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Subsection_Summary.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Subsection_Summary.yaml
@@ -2,7 +2,7 @@ _file_name: Subsection_Summary.yaml
 cache_timeout: null
 certification_details: null
 certified_by: null
-dataset_uuid: 1b1cbf0a-1193-4251-ad52-724c2f0190ae
+dataset_uuid: 649ad1d3-c0b4-48e1-a02b-e1d1e80c94ac
 description: null
 params:
   adhoc_filters:
@@ -12,17 +12,16 @@ params:
     operator: TEMPORAL_RANGE
     subject: visited_on
   all_columns: []
-  annotation_layers: []
   color_pn: true
   conditional_formatting:
   - colorScheme: '#ACE1C4'
     column: number_of_learners
     operator: "\u2265"
-    targetValue: 1
+    targetValue: 0
   - colorScheme: '#ACE1C4'
     column: views
     operator: "\u2265"
-    targetValue: 1
+    targetValue: 0
   extra_form_data: {}
   groupby:
   - section_with_name
@@ -41,10 +40,35 @@ params:
   temporal_columns_lookup:
     visited_on: true
   time_grain_sqla: P1D
+  timeseries_limit_metric:
+    aggregate: AVG
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: course_order
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 1354
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: Int32
+      type_generic: 0
+      verbose_name: null
+      warning_markdown: null
+    datasourceWarning: false
+    expressionType: SIMPLE
+    hasCustomLabel: false
+    label: AVG(course_order)
+    optionName: metric_krzt5zeo4w_kvb4m582d5
+    sqlExpression: null
   viz_type: table
 query_context:
   datasource:
-    id: 61
+    id: 89
     type: table
   force: false
   form_data:
@@ -60,14 +84,14 @@ query_context:
     - colorScheme: '#ACE1C4'
       column: Number of Learners
       operator: "\u2265"
-      targetValue: 1
+      targetValue: 0
     - colorScheme: '#ACE1C4'
       column: Views
       operator: "\u2265"
-      targetValue: 1
+      targetValue: 0
     dashboards:
-    - 629
-    datasource: 61__table
+    - 19
+    datasource: 89__table
     extra_form_data: {}
     force: false
     groupby:
@@ -85,11 +109,36 @@ query_context:
     row_limit: 1000
     server_page_length: 10
     show_cell_bars: true
-    slice_id: 26
+    slice_id: 145
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       visited_on: true
     time_grain_sqla: P1D
+    timeseries_limit_metric:
+      aggregate: AVG
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: course_order
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 1354
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: Int32
+        type_generic: 0
+        verbose_name: null
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: AVG(course_order)
+      optionName: metric_krzt5zeo4w_kvb4m582d5
+      sqlExpression: null
     viz_type: table
   queries:
   - annotation_layers: []
@@ -112,11 +161,59 @@ query_context:
     - views
     order_desc: true
     orderby:
-    - - number_of_learners
+    - - aggregate: AVG
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: course_order
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 1354
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: Int32
+          type_generic: 0
+          verbose_name: null
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: false
+        label: AVG(course_order)
+        optionName: metric_krzt5zeo4w_kvb4m582d5
+        sqlExpression: null
       - false
     post_processing: []
     row_limit: 1000
     series_limit: 0
+    series_limit_metric:
+      aggregate: AVG
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: course_order
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 1354
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: Int32
+        type_generic: 0
+        verbose_name: null
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: AVG(course_order)
+      optionName: metric_krzt5zeo4w_kvb4m582d5
+      sqlExpression: null
     url_params: {}
   result_format: json
   result_type: full
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Watched_Video_Segments.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Watched_Video_Segments.yaml
index 3ed512a6d..1bb40d4e8 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Watched_Video_Segments.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Watched_Video_Segments.yaml
@@ -43,19 +43,18 @@ params:
   truncate_metric: true
   viz_type: echarts_timeseries_bar
   xAxisForceCategorical: true
-  xAxisLabelRotation: 45
-  x_axis: segment_start
+  x_axis: start_position
   x_axis_sort_asc: true
   x_axis_sort_series: name
   x_axis_sort_series_ascending: true
   x_axis_time_format: smart_date
-  x_axis_title: Video Timestamp (in seconds)
-  x_axis_title_margin: 50
+  x_axis_title: Number of Views
+  x_axis_title_margin: 30
   y_axis_bounds:
   - null
   - null
   y_axis_format: SMART_NUMBER
-  y_axis_title: Number of Views
+  y_axis_title: Video Timestamp (in seconds)
   y_axis_title_margin: 30
   y_axis_title_position: Left
   zoomable: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Watched_Video_Segments_at-risk.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Watched_Video_Segments_at-risk.yaml
index 5230b0887..b50c5c823 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Watched_Video_Segments_at-risk.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Watched_Video_Segments_at-risk.yaml
@@ -36,21 +36,18 @@ params:
   truncateXAxis: true
   truncate_metric: true
   viz_type: echarts_timeseries_bar
-  xAxisForceCategorical: true
   xAxisLabelRotation: 45
   x_axis: segment_start
   x_axis_sort_asc: true
   x_axis_sort_series: name
   x_axis_sort_series_ascending: true
   x_axis_time_format: smart_date
-  x_axis_title: Video Timestamp (in seconds)
-  x_axis_title_margin: 50
+  x_axis_title_margin: 15
   y_axis_bounds:
   - null
   - null
   y_axis_format: SMART_NUMBER
-  y_axis_title: Number of Views
-  y_axis_title_margin: 30
+  y_axis_title_margin: 15
   y_axis_title_position: Left
 query_context:
   datasource:
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/at_risk_problem_results.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/at_risk_problem_results.yaml
index 178dab9e6..b9ef32542 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/at_risk_problem_results.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/at_risk_problem_results.yaml
@@ -29,19 +29,6 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Problem Name With Location
-- advanced_data_type: null
-  column_name: emission_time
-  description: null
-  expression: ''
-  extra:
-    warning_markdown: null
-  filterable: true
-  groupby: true
-  is_active: true
-  is_dttm: true
-  python_date_format: null
-  type: Nullable(DateTime)
-  verbose_name: Emission Time
 - advanced_data_type: null
   column_name: actor_id
   description: null
@@ -94,6 +81,19 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Course Run
+- advanced_data_type: null
+  column_name: emission_time
+  description: null
+  expression: ''
+  extra:
+    warning_markdown: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: true
+  python_date_format: null
+  type: DateTime
+  verbose_name: Emission Time
 - advanced_data_type: null
   column_name: problem_id
   description: null
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_navigation_completion.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_navigation_completion.yaml
index a5d588c27..bdcd18d1d 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_navigation_completion.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_navigation_completion.yaml
@@ -6,31 +6,31 @@ columns:
   column_name: subsection_with_name
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Subsection with Name
+  verbose_name: Subsection Location and Name
 - advanced_data_type: null
   column_name: section_with_name
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Section with Name
+  verbose_name: Section Location and Name
 - advanced_data_type: null
   column_name: page_count
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -42,7 +42,7 @@ columns:
   column_name: actor_id
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -54,7 +54,7 @@ columns:
   column_name: block_id
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -66,7 +66,7 @@ columns:
   column_name: course_key
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -78,7 +78,7 @@ columns:
   column_name: course_name
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -90,7 +90,7 @@ columns:
   column_name: course_run
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -102,7 +102,7 @@ columns:
   column_name: visited_on
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -114,7 +114,7 @@ columns:
   column_name: email
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -126,7 +126,7 @@ columns:
   column_name: name
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -138,7 +138,7 @@ columns:
   column_name: org
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -150,7 +150,7 @@ columns:
   column_name: username
   description: null
   expression: ''
-  extra: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -158,6 +158,18 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Username
+- advanced_data_type: null
+  column_name: course_order
+  description: null
+  expression: null
+  extra: {}
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: Int32
+  verbose_name: Course Order
 database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6
 default_endpoint: null
 description: null
@@ -170,7 +182,8 @@ metrics:
   d3format: null
   description: null
   expression: COUNT(*)
-  extra: null
+  extra:
+    warning_markdown: ''
   metric_name: count
   metric_type: count
   verbose_name: COUNT(*)
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_pageview_engagement.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_pageview_engagement.yaml
index 6543a5691..026e10b15 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_pageview_engagement.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_pageview_engagement.yaml
@@ -3,106 +3,115 @@ always_filter_main_dttm: false
 cache_timeout: null
 columns:
 - advanced_data_type: null
-  column_name: section_subsection_page_engagement
+  column_name: subsection_with_name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Section/Subsection Page Enggagement
+  verbose_name: Subsection Location and Name
 - advanced_data_type: null
-  column_name: section_subsection_name
+  column_name: section_with_name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Section/Subsection Name
+  verbose_name: Section Location and Name
 - advanced_data_type: null
-  column_name: actor_id
+  column_name: section_subsection_page_engagement
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Actor ID
+  verbose_name: Section/Subsection Page Enggagement
 - advanced_data_type: null
-  column_name: course_key
+  column_name: section_subsection_name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Course Key
+  verbose_name: Section/Subsection Name
 - advanced_data_type: null
-  column_name: content_level
+  column_name: actor_id
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Content Level
+  verbose_name: Actor ID
 - advanced_data_type: null
-  column_name: course_run
+  column_name: course_key
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Course Run
+  verbose_name: Course Key
 - advanced_data_type: null
-  column_name: subsection_with_name
+  column_name: content_level
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Subsection Name
+  verbose_name: Content Level
 - advanced_data_type: null
-  column_name: section_with_name
+  column_name: course_run
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Section Name
+  verbose_name: Course Run
 - advanced_data_type: null
   column_name: email
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -114,7 +123,8 @@ columns:
   column_name: name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -126,7 +136,8 @@ columns:
   column_name: org
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -138,7 +149,8 @@ columns:
   column_name: username
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_problem_engagement.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_problem_engagement.yaml
index f9bbd1315..bad6839b8 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_problem_engagement.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_problem_engagement.yaml
@@ -6,8 +6,7 @@ columns:
   column_name: section_subsection_problem_engagement
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -19,8 +18,7 @@ columns:
   column_name: section_subsection_name
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -32,8 +30,7 @@ columns:
   column_name: actor_id
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -45,8 +42,7 @@ columns:
   column_name: course_key
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -58,8 +54,7 @@ columns:
   column_name: content_level
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -71,8 +66,7 @@ columns:
   column_name: course_run
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -84,8 +78,7 @@ columns:
   column_name: email
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -97,8 +90,7 @@ columns:
   column_name: name
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -110,8 +102,7 @@ columns:
   column_name: org
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -123,8 +114,7 @@ columns:
   column_name: username
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_engagement.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_engagement.yaml
index 3931423a7..13b16492e 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_engagement.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_engagement.yaml
@@ -6,8 +6,7 @@ columns:
   column_name: section_subsection_video_engagement
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -19,8 +18,7 @@ columns:
   column_name: section_subsection_name
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -32,8 +30,7 @@ columns:
   column_name: actor_id
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -45,8 +42,7 @@ columns:
   column_name: course_key
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -58,8 +54,7 @@ columns:
   column_name: content_level
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -71,8 +66,7 @@ columns:
   column_name: course_run
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -84,8 +78,7 @@ columns:
   column_name: email
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -97,8 +90,7 @@ columns:
   column_name: name
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -110,8 +102,7 @@ columns:
   column_name: org
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -123,8 +114,7 @@ columns:
   column_name: username
   description: null
   expression: null
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_plays.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_plays.yaml
index 78167c8a4..d9fca7c3a 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_plays.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_plays.yaml
@@ -3,7 +3,7 @@ always_filter_main_dttm: false
 cache_timeout: null
 columns:
 - advanced_data_type: null
-  column_name: video_name_with_location
+  column_name: subsection_with_name
   description: null
   expression: ''
   extra: {}
@@ -13,9 +13,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Video Name With Location
+  verbose_name: Subsection Location and Name
 - advanced_data_type: null
-  column_name: video_position
+  column_name: section_with_name
   description: null
   expression: ''
   extra: {}
@@ -24,10 +24,10 @@ columns:
   is_active: true
   is_dttm: false
   python_date_format: null
-  type: Decimal(9, 2)
-  verbose_name: Video Position
+  type: String
+  verbose_name: Section Location and Name
 - advanced_data_type: null
-  column_name: subsection_with_name
+  column_name: video_name_with_location
   description: null
   expression: ''
   extra: {}
@@ -37,9 +37,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Subsection With Name
+  verbose_name: Video Name With Location
 - advanced_data_type: null
-  column_name: section_with_name
+  column_name: video_position
   description: null
   expression: ''
   extra: {}
@@ -48,8 +48,8 @@ columns:
   is_active: true
   is_dttm: false
   python_date_format: null
-  type: String
-  verbose_name: Section With Name
+  type: Decimal(9, 2)
+  verbose_name: Video Position
 - advanced_data_type: null
   column_name: video_duration
   description: null
@@ -254,25 +254,28 @@ metrics:
   d3format: null
   description: null
   expression: count(distinct actor_id)
-  extra: {}
+  extra:
+    warning_markdown: ''
   metric_name: unique_watchers
   metric_type: null
-  verbose_name: Unique Watchers
+  verbose_name: Unique Viewers
   warning_text: null
 - currency: null
   d3format: null
   description: null
   expression: count(*)
-  extra: {}
+  extra:
+    warning_markdown: ''
   metric_name: total_plays
   metric_type: null
-  verbose_name: Total plays
+  verbose_name: Total Views
   warning_text: null
 - currency: null
   d3format: null
   description: null
   expression: COUNT(*)
-  extra: {}
+  extra:
+    warning_markdown: ''
   metric_name: count
   metric_type: count
   verbose_name: COUNT(*)
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_watches.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_watches.yaml
index cc2842ba2..fc8852b67 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_watches.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_at_risk_video_watches.yaml
@@ -36,7 +36,7 @@ columns:
   is_active: true
   is_dttm: false
   python_date_format: null
-  type: UInt64
+  type: Int32
   verbose_name: Watched Segment Count
 - advanced_data_type: null
   column_name: watched_entire_video
@@ -48,7 +48,7 @@ columns:
   is_active: true
   is_dttm: false
   python_date_format: null
-  type: UInt8
+  type: Boolean
   verbose_name: Watched Entire Video
 - advanced_data_type: null
   column_name: actor_id
@@ -99,7 +99,7 @@ columns:
   type: String
   verbose_name: Course Run
 - advanced_data_type: null
-  column_name: subsection_with_name
+  column_name: video_name
   description: null
   expression: null
   extra: {}
@@ -109,31 +109,31 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Subsection Name
+  verbose_name: Video Name
 - advanced_data_type: null
-  column_name: section_with_name
+  column_name: subsection_with_name
   description: null
   expression: null
-  extra: {}
+  extra: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Section Name
+  verbose_name: Subsection Name
 - advanced_data_type: null
-  column_name: video_name
+  column_name: section_with_name
   description: null
   expression: null
-  extra: {}
+  extra: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Video Name
+  verbose_name: Section Name
 - advanced_data_type: null
   column_name: org
   description: null
@@ -158,8 +158,7 @@ metrics:
   d3format: null
   description: null
   expression: count(*) - count(distinct actor_id)
-  extra:
-    warning_markdown: ''
+  extra: {}
   metric_name: repeat_views
   metric_type: null
   verbose_name: Repeat Views
@@ -167,22 +166,21 @@ metrics:
 - currency: null
   d3format: null
   description: null
-  expression: count(distinct actor_id)
+  expression: count(*)
   extra:
     warning_markdown: ''
-  metric_name: unique_viewers
+  metric_name: count
   metric_type: null
-  verbose_name: Unique Viewers
+  verbose_name: Total Views
   warning_text: null
 - currency: null
   d3format: null
   description: null
-  expression: count(*)
-  extra:
-    warning_markdown: ''
-  metric_name: count
+  expression: count(distinct actor_id)
+  extra: {}
+  metric_name: unique_viewers
   metric_type: null
-  verbose_name: Total Views
+  verbose_name: Unique Viewers
   warning_text: null
 normalize_columns: true
 offset: 0
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_navigation_completion.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_navigation_completion.yaml
index 31c19b638..1fb6a57b0 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_navigation_completion.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_navigation_completion.yaml
@@ -6,7 +6,8 @@ columns:
   column_name: subsection_with_name
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -18,7 +19,8 @@ columns:
   column_name: section_with_name
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -30,7 +32,8 @@ columns:
   column_name: page_count
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -42,7 +45,8 @@ columns:
   column_name: actor_id
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -54,7 +58,8 @@ columns:
   column_name: block_id
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -66,7 +71,8 @@ columns:
   column_name: course_key
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -78,7 +84,8 @@ columns:
   column_name: course_name
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -90,7 +97,8 @@ columns:
   column_name: course_run
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -102,7 +110,8 @@ columns:
   column_name: visited_on
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -114,7 +123,8 @@ columns:
   column_name: email
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -126,7 +136,8 @@ columns:
   column_name: name
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -138,7 +149,8 @@ columns:
   column_name: org
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -150,7 +162,8 @@ columns:
   column_name: username
   description: null
   expression: ''
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -158,6 +171,18 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Username
+- advanced_data_type: null
+  column_name: course_order
+  description: null
+  expression: null
+  extra: {}
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: Int32
+  verbose_name: Course Order
 database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6
 default_endpoint: null
 description: null
@@ -190,7 +215,8 @@ metrics:
   d3format: null
   description: null
   expression: SUM(page_count)
-  extra: {}
+  extra:
+    warning_markdown: ''
   metric_name: views
   metric_type: null
   verbose_name: Views
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml
index fdbb9c318..f0b266f04 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml
@@ -149,7 +149,7 @@ metrics:
     warning_markdown: ''
   metric_name: at_leat_one_page_viewed
   metric_type: null
-  verbose_name: At Leat One Page Viewed
+  verbose_name: Viewed At Least One Page
   warning_text: null
 - currency: null
   d3format: null
@@ -160,7 +160,7 @@ metrics:
     warning_markdown: ''
   metric_name: all_pages_viewed
   metric_type: null
-  verbose_name: All Pages Viewed
+  verbose_name: Viewed All Pages
   warning_text: null
 - currency: null
   d3format: null
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_engagement.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_engagement.yaml
index 936846c4d..4193b6b64 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_engagement.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_engagement.yaml
@@ -3,7 +3,7 @@ always_filter_main_dttm: false
 cache_timeout: null
 columns:
 - advanced_data_type: null
-  column_name: section_subsection_problem_engagement
+  column_name: actor_id
   description: null
   expression: null
   extra:
@@ -14,9 +14,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Section Subsection Problem Engagement
+  verbose_name: Actor Id
 - advanced_data_type: null
-  column_name: section_subsection_name
+  column_name: course_key
   description: null
   expression: null
   extra:
@@ -27,9 +27,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Section Subsection Name
+  verbose_name: Course Key
 - advanced_data_type: null
-  column_name: actor_id
+  column_name: content_level
   description: null
   expression: null
   extra:
@@ -40,9 +40,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Actor Id
+  verbose_name: Content Level
 - advanced_data_type: null
-  column_name: course_key
+  column_name: course_run
   description: null
   expression: null
   extra:
@@ -53,9 +53,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Course Key
+  verbose_name: Course Run
 - advanced_data_type: null
-  column_name: content_level
+  column_name: email
   description: null
   expression: null
   extra:
@@ -66,9 +66,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Content Level
+  verbose_name: Email
 - advanced_data_type: null
-  column_name: course_run
+  column_name: name
   description: null
   expression: null
   extra:
@@ -79,9 +79,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Course Run
+  verbose_name: Name
 - advanced_data_type: null
-  column_name: email
+  column_name: org
   description: null
   expression: null
   extra:
@@ -92,9 +92,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Email
+  verbose_name: Org
 - advanced_data_type: null
-  column_name: name
+  column_name: username
   description: null
   expression: null
   extra:
@@ -105,9 +105,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Name
+  verbose_name: Username
 - advanced_data_type: null
-  column_name: org
+  column_name: section_subsection_problem_engagement
   description: null
   expression: null
   extra:
@@ -118,9 +118,9 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Org
+  verbose_name: section_subsection_problem_engagement
 - advanced_data_type: null
-  column_name: username
+  column_name: section_subsection_name
   description: null
   expression: null
   extra:
@@ -131,7 +131,7 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Username
+  verbose_name: section_subsection_name
 database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6
 default_endpoint: null
 description: null
@@ -146,10 +146,10 @@ metrics:
   expression: |-
     countIf("section_subsection_problem_engagement" = 'At least one problem attempted' or "section_subsection_problem_engagement" = 'All problems attempted')
   extra:
-    warning_markdown: null
+    warning_markdown: ''
   metric_name: attempted_at_least_one_problem
   metric_type: null
-  verbose_name: Attempted at Least One Problem
+  verbose_name: Attempted At Least One Problem
   warning_text: null
 - currency: null
   d3format: null
@@ -157,7 +157,7 @@ metrics:
   expression: |-
     countIf("section_subsection_problem_engagement" = 'All problems attempted')
   extra:
-    warning_markdown: null
+    warning_markdown: ''
   metric_name: attempted_all_problems
   metric_type: null
   verbose_name: Attempted All Problems
@@ -167,7 +167,7 @@ metrics:
   description: null
   expression: count(*)
   extra:
-    warning_markdown: null
+    warning_markdown: ''
   metric_name: count
   metric_type: null
   verbose_name: Count
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml
index ccf9c637f..c6cfbb1a1 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml
@@ -149,7 +149,7 @@ metrics:
     warning_markdown: ''
   metric_name: at_least_one_viewed
   metric_type: null
-  verbose_name: At Leat One Viewed
+  verbose_name: Viewed At Least One Video
   warning_text: null
 - currency: null
   d3format: null
@@ -160,7 +160,7 @@ metrics:
     warning_markdown: ''
   metric_name: all_videos_viewed
   metric_type: null
-  verbose_name: All Videos Viewed
+  verbose_name: Viewed All Videos
   warning_text: null
 - currency: null
   d3format: null
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml
index 8ca9b38df..9a460cef8 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml
@@ -7,8 +7,7 @@ columns:
   description: null
   expression: |-
     concat(username, '-', name, '-', email)
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -17,63 +16,58 @@ columns:
   type: null
   verbose_name: User Info
 - advanced_data_type: null
-  column_name: video_name_with_location
+  column_name: subsection_with_name
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Video Name With Location
+  verbose_name: Subsection Location and Name
 - advanced_data_type: null
-  column_name: video_position
+  column_name: section_with_name
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
-  type: Decimal(9, 2)
-  verbose_name: Video Position
+  type: String
+  verbose_name: Section Location and Name
 - advanced_data_type: null
-  column_name: subsection_with_name
+  column_name: video_name_with_location
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Subsection With Name
+  verbose_name: Video Location and Name
 - advanced_data_type: null
-  column_name: section_with_name
+  column_name: video_position
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
-  type: String
-  verbose_name: Section With Name
+  type: Decimal(9, 2)
+  verbose_name: Video Position
 - advanced_data_type: null
   column_name: video_duration
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -85,8 +79,7 @@ columns:
   column_name: actor_id
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -98,8 +91,7 @@ columns:
   column_name: visualization_bucket
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -111,8 +103,7 @@ columns:
   column_name: course_key
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -124,8 +115,7 @@ columns:
   column_name: course_name
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -137,8 +127,7 @@ columns:
   column_name: course_run
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -150,8 +139,7 @@ columns:
   column_name: emission_time
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -163,8 +151,7 @@ columns:
   column_name: video_id
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -176,8 +163,7 @@ columns:
   column_name: video_link
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -189,8 +175,7 @@ columns:
   column_name: video_name
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -202,8 +187,7 @@ columns:
   column_name: graded
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -215,8 +199,7 @@ columns:
   column_name: email
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -228,8 +211,7 @@ columns:
   column_name: name
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -241,8 +223,7 @@ columns:
   column_name: org
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -254,8 +235,7 @@ columns:
   column_name: username
   description: null
   expression: ''
-  extra:
-    warning_markdown: null
+  extra: {}
   filterable: true
   groupby: true
   is_active: true
@@ -291,7 +271,7 @@ metrics:
     warning_markdown: ''
   metric_name: unique_watchers
   metric_type: null
-  verbose_name: Unique Watchers
+  verbose_name: Unique Viewers
   warning_text: null
 - currency: null
   d3format: null
@@ -301,7 +281,7 @@ metrics:
     warning_markdown: ''
   metric_name: total_plays
   metric_type: null
-  verbose_name: Total plays
+  verbose_name: Total Views
   warning_text: null
 - currency: null
   d3format: null
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_watches.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_watches.yaml
index aed04b815..8adf44f10 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_watches.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_watches.yaml
@@ -6,31 +6,21 @@ columns:
   column_name: video_name_with_location
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Video Name With Location
-- advanced_data_type: null
-  column_name: video_segment_count
-  description: null
-  expression: null
-  extra: {}
-  filterable: true
-  groupby: true
-  is_active: true
-  is_dttm: false
-  python_date_format: null
-  type: Float64
-  verbose_name: Video Segment Count
+  verbose_name: Video Location and Name
 - advanced_data_type: null
   column_name: watched_segment_count
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -42,7 +32,8 @@ columns:
   column_name: watched_entire_video
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -54,7 +45,8 @@ columns:
   column_name: actor_id
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -66,7 +58,8 @@ columns:
   column_name: course_key
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -78,7 +71,8 @@ columns:
   column_name: course_name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -90,7 +84,8 @@ columns:
   column_name: course_run
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -102,7 +97,8 @@ columns:
   column_name: subsection_with_name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -114,7 +110,8 @@ columns:
   column_name: section_with_name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -126,7 +123,8 @@ columns:
   column_name: video_name
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -138,7 +136,8 @@ columns:
   column_name: org
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -146,6 +145,19 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Organization
+- advanced_data_type: null
+  column_name: video_segment_count
+  description: null
+  expression: null
+  extra:
+    warning_markdown: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: false
+  python_date_format: null
+  type: Float64
+  verbose_name: Video Segment Count
 database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6
 default_endpoint: null
 description: null
diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/int_problem_results.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/int_problem_results.yaml
index 1def6e903..515d0f8d6 100644
--- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/int_problem_results.yaml
+++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/int_problem_results.yaml
@@ -28,20 +28,7 @@ columns:
   is_dttm: false
   python_date_format: null
   type: String
-  verbose_name: Problem name with location
-- advanced_data_type: null
-  column_name: emission_time
-  description: null
-  expression: ''
-  extra:
-    warning_markdown: null
-  filterable: true
-  groupby: true
-  is_active: true
-  is_dttm: true
-  python_date_format: null
-  type: Nullable(DateTime)
-  verbose_name: Emission Time
+  verbose_name: Problem Location and Name
 - advanced_data_type: null
   column_name: actor_id
   description: null
@@ -94,6 +81,19 @@ columns:
   python_date_format: null
   type: String
   verbose_name: Course Run
+- advanced_data_type: null
+  column_name: emission_time
+  description: null
+  expression: ''
+  extra:
+    warning_markdown: null
+  filterable: true
+  groupby: true
+  is_active: true
+  is_dttm: true
+  python_date_format: null
+  type: DateTime
+  verbose_name: Emission Time
 - advanced_data_type: null
   column_name: problem_id
   description: null
@@ -215,7 +215,8 @@ columns:
   column_name: course_order
   description: null
   expression: null
-  extra: {}
+  extra:
+    warning_markdown: null
   filterable: true
   groupby: true
   is_active: true
@@ -235,7 +236,7 @@ metrics:
   d3format: null
   description: null
   expression: "  ROUND(\r\n    (SUM(CASE WHEN not success THEN attempts ELSE 0 END))\
-    \ /\r\n    SUM(attempts), 2\r\n  )*100"
+    \ /\r\n    SUM(attempts), 2\r\n  )"
   extra:
     warning_markdown: ''
   metric_name: incorrect_percent
@@ -246,7 +247,7 @@ metrics:
   d3format: null
   description: null
   expression: "  ROUND(\r\n    (SUM(CASE WHEN success THEN attempts ELSE 0 END)) /\r\
-    \n    SUM(attempts), 2\r\n  )*100"
+    \n    SUM(attempts), 2\r\n  )"
   extra:
     warning_markdown: ''
   metric_name: correct_percent
@@ -281,7 +282,7 @@ metrics:
     warning_markdown: ''
   metric_name: number_of_learners
   metric_type: null
-  verbose_name: Number of Learners who attemped the problem
+  verbose_name: Number of Learners who Attempted the Problem
   warning_text: null
 - currency: null
   d3format: null
@@ -291,7 +292,7 @@ metrics:
     warning_markdown: ''
   metric_name: median_attemps
   metric_type: null
-  verbose_name: Median of Attempts
+  verbose_name: Median Attempts
   warning_text: null
 - currency: null
   d3format: null