diff --git a/apex/f770/application/pages/page_00920.sql b/apex/f770/application/pages/page_00920.sql
index 64f6ce5..9654a3b 100644
--- a/apex/f770/application/pages/page_00920.sql
+++ b/apex/f770/application/pages/page_00920.sql
@@ -22,7 +22,7 @@ wwv_flow_api.create_page(
 ,p_page_template_options=>'#DEFAULT#'
 ,p_required_role=>wwv_flow_api.id(9823062898204869)
 ,p_last_updated_by=>'DEV'
-,p_last_upd_yyyymmddhh24miss=>'20211225215423'
+,p_last_upd_yyyymmddhh24miss=>'20211226220826'
 );
 wwv_flow_api.create_page_plug(
  p_id=>wwv_flow_api.id(9563395243581646)
@@ -205,7 +205,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_SINGLE_CHECKBOX'
 ,p_heading=>'Is Active'
 ,p_heading_alignment=>'CENTER'
-,p_display_sequence=>110
+,p_display_sequence=>130
 ,p_value_alignment=>'CENTER'
 ,p_attribute_01=>'N'
 ,p_attribute_02=>'Y'
@@ -232,7 +232,7 @@ wwv_flow_api.create_region_column(
 ,p_data_type=>'VARCHAR2'
 ,p_is_query_only=>true
 ,p_item_type=>'NATIVE_HIDDEN'
-,p_display_sequence=>130
+,p_display_sequence=>150
 ,p_attribute_01=>'Y'
 ,p_filter_is_required=>false
 ,p_use_as_row_header=>false
@@ -249,7 +249,7 @@ wwv_flow_api.create_region_column(
 ,p_data_type=>'DATE'
 ,p_is_query_only=>true
 ,p_item_type=>'NATIVE_HIDDEN'
-,p_display_sequence=>140
+,p_display_sequence=>160
 ,p_attribute_01=>'Y'
 ,p_filter_is_required=>false
 ,p_use_as_row_header=>false
@@ -283,7 +283,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_SINGLE_CHECKBOX'
 ,p_heading=>'Is Developer'
 ,p_heading_alignment=>'CENTER'
-,p_display_sequence=>120
+,p_display_sequence=>140
 ,p_value_alignment=>'CENTER'
 ,p_attribute_01=>'N'
 ,p_attribute_02=>'Y'
@@ -363,7 +363,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_DISPLAY_ONLY'
 ,p_heading=>'Roles'
 ,p_heading_alignment=>'RIGHT'
-,p_display_sequence=>100
+,p_display_sequence=>120
 ,p_value_alignment=>'RIGHT'
 ,p_attribute_02=>'VALUE'
 ,p_attribute_05=>'PLAIN'
@@ -381,20 +381,20 @@ wwv_flow_api.create_region_column(
 );
 wwv_flow_api.create_region_column(
  p_id=>wwv_flow_api.id(9716748710455620)
-,p_name=>'COUNT_REQUESTS'
+,p_name=>'COUNT_PAGES'
 ,p_source_type=>'DB_COLUMN'
-,p_source_expression=>'COUNT_REQUESTS'
+,p_source_expression=>'COUNT_PAGES'
 ,p_data_type=>'NUMBER'
 ,p_is_query_only=>true
 ,p_item_type=>'NATIVE_DISPLAY_ONLY'
-,p_heading=>'Requests'
+,p_heading=>'Pages'
 ,p_heading_alignment=>'RIGHT'
 ,p_display_sequence=>80
 ,p_value_alignment=>'RIGHT'
 ,p_attribute_02=>'VALUE'
 ,p_attribute_05=>'PLAIN'
 ,p_link_target=>'f?p=&APP_ID.:901:&SESSION.::&DEBUG.:901:P901_USER_ID,P901_FLAG:&USER_ID.,A'
-,p_link_text=>'&COUNT_REQUESTS.'
+,p_link_text=>'&COUNT_PAGES.'
 ,p_enable_filter=>true
 ,p_filter_is_required=>false
 ,p_filter_lov_type=>'NONE'
@@ -405,6 +405,60 @@ wwv_flow_api.create_region_column(
 ,p_is_primary_key=>false
 ,p_include_in_export=>true
 );
+wwv_flow_api.create_region_column(
+ p_id=>wwv_flow_api.id(10889611734121605)
+,p_name=>'COUNT_ERRORS'
+,p_source_type=>'DB_COLUMN'
+,p_source_expression=>'COUNT_ERRORS'
+,p_data_type=>'NUMBER'
+,p_is_query_only=>false
+,p_item_type=>'NATIVE_DISPLAY_ONLY'
+,p_heading=>'Errors'
+,p_heading_alignment=>'RIGHT'
+,p_display_sequence=>100
+,p_value_alignment=>'RIGHT'
+,p_attribute_02=>'VALUE'
+,p_attribute_05=>'PLAIN'
+,p_link_target=>'f?p=&APP_ID.:901:&SESSION.::&DEBUG.:901:P901_USER_ID,P901_FLAG:&USER_ID.,E'
+,p_link_text=>'&COUNT_ERRORS.'
+,p_enable_filter=>true
+,p_filter_is_required=>false
+,p_filter_lov_type=>'NONE'
+,p_use_as_row_header=>false
+,p_enable_sort_group=>true
+,p_enable_control_break=>true
+,p_enable_hide=>true
+,p_is_primary_key=>false
+,p_duplicate_value=>true
+,p_include_in_export=>true
+);
+wwv_flow_api.create_region_column(
+ p_id=>wwv_flow_api.id(10889793031121606)
+,p_name=>'COUNT_EVENTS'
+,p_source_type=>'DB_COLUMN'
+,p_source_expression=>'COUNT_EVENTS'
+,p_data_type=>'NUMBER'
+,p_is_query_only=>false
+,p_item_type=>'NATIVE_DISPLAY_ONLY'
+,p_heading=>'Events'
+,p_heading_alignment=>'RIGHT'
+,p_display_sequence=>110
+,p_value_alignment=>'RIGHT'
+,p_attribute_02=>'VALUE'
+,p_attribute_05=>'PLAIN'
+,p_link_target=>'f?p=&APP_ID.:921:&SESSION.::&DEBUG.:921:P921_USER_ID:&USER_ID.'
+,p_link_text=>'&COUNT_EVENTS.'
+,p_enable_filter=>true
+,p_filter_is_required=>false
+,p_filter_lov_type=>'NONE'
+,p_use_as_row_header=>false
+,p_enable_sort_group=>true
+,p_enable_control_break=>true
+,p_enable_hide=>true
+,p_is_primary_key=>false
+,p_duplicate_value=>true
+,p_include_in_export=>true
+);
 wwv_flow_api.create_interactive_grid(
  p_id=>wwv_flow_api.id(9563544810581648)
 ,p_internal_uid=>9563544810581648
@@ -438,6 +492,7 @@ wwv_flow_api.create_ig_report(
 ,p_static_id=>'96189'
 ,p_type=>'PRIMARY'
 ,p_default_view=>'GRID'
+,p_rows_per_page=>20
 ,p_show_row_number=>false
 ,p_settings_area_expanded=>true
 );
@@ -484,16 +539,16 @@ wwv_flow_api.create_ig_report_column(
 ,p_column_id=>wwv_flow_api.id(9611623062237502)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>113
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9623103125238104)
 ,p_view_id=>wwv_flow_api.id(9619064172238094)
-,p_display_seq=>11
+,p_display_seq=>13
 ,p_column_id=>wwv_flow_api.id(9611749328237503)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>119
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9624019816238107)
@@ -522,11 +577,11 @@ wwv_flow_api.create_ig_report_column(
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9652648689580585)
 ,p_view_id=>wwv_flow_api.id(9619064172238094)
-,p_display_seq=>12
+,p_display_seq=>14
 ,p_column_id=>wwv_flow_api.id(9614276104237528)
 ,p_is_visible=>false
 ,p_is_frozen=>false
-,p_width=>114
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9653537674580587)
@@ -535,7 +590,7 @@ wwv_flow_api.create_ig_report_column(
 ,p_column_id=>wwv_flow_api.id(9614339786237529)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>104
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9654456627580589)
@@ -544,16 +599,16 @@ wwv_flow_api.create_ig_report_column(
 ,p_column_id=>wwv_flow_api.id(9614415672237530)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>117
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9655266912580591)
 ,p_view_id=>wwv_flow_api.id(9619064172238094)
-,p_display_seq=>10
+,p_display_seq=>12
 ,p_column_id=>wwv_flow_api.id(9614552428237531)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>112
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9776416461962391)
@@ -562,11 +617,189 @@ wwv_flow_api.create_ig_report_column(
 ,p_column_id=>wwv_flow_api.id(9716748710455620)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>115
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(10926951014194974)
+,p_view_id=>wwv_flow_api.id(9619064172238094)
+,p_display_seq=>10
+,p_column_id=>wwv_flow_api.id(10889611734121605)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(10927851431194980)
+,p_view_id=>wwv_flow_api.id(9619064172238094)
+,p_display_seq=>11
+,p_column_id=>wwv_flow_api.id(10889793031121606)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report(
+ p_id=>wwv_flow_api.id(20587442495464693)
+,p_interactive_grid_id=>wwv_flow_api.id(9563544810581648)
+,p_name=>'Active today'
+,p_static_id=>'109699'
+,p_type=>'ALTERNATIVE'
+,p_default_view=>'GRID'
+,p_show_row_number=>false
+,p_settings_area_expanded=>true
+);
+wwv_flow_api.create_ig_report_view(
+ p_id=>wwv_flow_api.id(20587673837464693)
+,p_report_id=>wwv_flow_api.id(20587442495464693)
+,p_view_type=>'GRID'
+,p_stretch_columns=>true
+,p_srv_exclude_null_values=>false
+,p_srv_only_display_columns=>true
+,p_edit_mode=>false
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20588140888464694)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>1
+,p_column_id=>wwv_flow_api.id(9563602761581649)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_sort_order=>1
+,p_sort_direction=>'ASC'
+,p_sort_nulls=>'LAST'
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20589068867464696)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>2
+,p_column_id=>wwv_flow_api.id(9563774647581650)
+,p_is_visible=>true
+,p_is_frozen=>false
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20589994158464699)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>3
+,p_column_id=>wwv_flow_api.id(9611573922237501)
+,p_is_visible=>true
+,p_is_frozen=>false
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20590901179464701)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>4
+,p_column_id=>wwv_flow_api.id(9611623062237502)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20591712790464703)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>13
+,p_column_id=>wwv_flow_api.id(9611749328237503)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20592629481464706)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>6
+,p_column_id=>wwv_flow_api.id(9611856272237504)
+,p_is_visible=>true
+,p_is_frozen=>false
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20593523034464708)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>7
+,p_column_id=>wwv_flow_api.id(9611979855237505)
+,p_is_visible=>true
+,p_is_frozen=>false
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20597264079497443)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>0
+,p_column_id=>wwv_flow_api.id(9612058204237506)
+,p_is_visible=>true
+,p_is_frozen=>true
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20621258354807184)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>14
+,p_column_id=>wwv_flow_api.id(9614276104237528)
+,p_is_visible=>false
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20622147339807186)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>7
+,p_column_id=>wwv_flow_api.id(9614339786237529)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20623066292807188)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>10
+,p_column_id=>wwv_flow_api.id(9614415672237530)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20623876577807190)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>12
+,p_column_id=>wwv_flow_api.id(9614552428237531)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(20745026127188990)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>9
+,p_column_id=>wwv_flow_api.id(9716748710455620)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(21895560679421573)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>10
+,p_column_id=>wwv_flow_api.id(10889611734121605)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(21896461096421579)
+,p_view_id=>wwv_flow_api.id(20587673837464693)
+,p_display_seq=>11
+,p_column_id=>wwv_flow_api.id(10889793031121606)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_filter(
+ p_id=>wwv_flow_api.id(10969067051226600)
+,p_report_id=>wwv_flow_api.id(20587442495464693)
+,p_type=>'COLUMN'
+,p_column_id=>wwv_flow_api.id(9614339786237529)
+,p_operator=>'NN'
+,p_is_case_sensitive=>false
+,p_is_enabled=>true
 );
 wwv_flow_api.create_page_plug(
  p_id=>wwv_flow_api.id(9612428039237510)
-,p_plug_name=>'Auth Schemes'
+,p_plug_name=>'Auth Schemes & Roles'
 ,p_icon_css_classes=>'fa-lock'
 ,p_region_template_options=>'#DEFAULT#'
 ,p_plug_template=>wwv_flow_api.id(9070356145569920)
@@ -635,6 +868,10 @@ wwv_flow_api.create_region_column_group(
  p_id=>wwv_flow_api.id(9809400623099811)
 ,p_heading=>'Usage'
 );
+wwv_flow_api.create_region_column_group(
+ p_id=>wwv_flow_api.id(10890534130121614)
+,p_heading=>'Roles'
+);
 wwv_flow_api.create_region_column(
  p_id=>wwv_flow_api.id(9719130728455644)
 ,p_name=>'AUTH_SCHEME'
@@ -642,51 +879,15 @@ wwv_flow_api.create_region_column(
 ,p_source_expression=>'AUTH_SCHEME'
 ,p_data_type=>'VARCHAR2'
 ,p_is_query_only=>false
-,p_item_type=>'NATIVE_TEXT_FIELD'
+,p_item_type=>'NATIVE_HTML_EXPRESSION'
 ,p_heading=>'Auth Scheme'
 ,p_heading_alignment=>'LEFT'
-,p_display_sequence=>10
-,p_value_alignment=>'LEFT'
-,p_group_id=>wwv_flow_api.id(9809200756099809)
-,p_use_group_for=>'BOTH'
-,p_attribute_05=>'BOTH'
-,p_is_required=>true
-,p_max_length=>255
-,p_enable_filter=>true
-,p_filter_operators=>'C:S:CASE_INSENSITIVE:REGEXP'
-,p_filter_is_required=>false
-,p_filter_text_case=>'MIXED'
-,p_filter_lov_type=>'NONE'
-,p_use_as_row_header=>false
-,p_enable_sort_group=>true
-,p_enable_control_break=>true
-,p_enable_hide=>true
-,p_is_primary_key=>false
-,p_duplicate_value=>true
-,p_include_in_export=>true
-);
-wwv_flow_api.create_region_column(
- p_id=>wwv_flow_api.id(9719317337455646)
-,p_name=>'AUTH_SOURCE'
-,p_source_type=>'DB_COLUMN'
-,p_source_expression=>'AUTH_SOURCE'
-,p_data_type=>'VARCHAR2'
-,p_is_query_only=>false
-,p_item_type=>'NATIVE_TEXT_FIELD'
-,p_heading=>'Source Code'
-,p_heading_alignment=>'LEFT'
 ,p_display_sequence=>30
 ,p_value_alignment=>'LEFT'
 ,p_group_id=>wwv_flow_api.id(9809200756099809)
 ,p_use_group_for=>'BOTH'
-,p_attribute_05=>'BOTH'
-,p_is_required=>false
-,p_max_length=>4000
-,p_enable_filter=>true
-,p_filter_operators=>'C:S:CASE_INSENSITIVE:REGEXP'
+,p_attribute_01=>'<span class="&AUTH_SCHEME_ICON."></span>&AUTH_SCHEME.'
 ,p_filter_is_required=>false
-,p_filter_text_case=>'MIXED'
-,p_filter_lov_type=>'NONE'
 ,p_use_as_row_header=>false
 ,p_enable_sort_group=>true
 ,p_enable_control_break=>true
@@ -702,14 +903,13 @@ wwv_flow_api.create_region_column(
 ,p_source_expression=>'ERROR_MESSAGE'
 ,p_data_type=>'VARCHAR2'
 ,p_is_query_only=>false
-,p_item_type=>'NATIVE_TEXT_FIELD'
+,p_item_type=>'NATIVE_DISPLAY_ONLY'
 ,p_heading=>'Error Message'
 ,p_heading_alignment=>'LEFT'
-,p_display_sequence=>120
+,p_display_sequence=>150
 ,p_value_alignment=>'LEFT'
-,p_attribute_05=>'BOTH'
-,p_is_required=>false
-,p_max_length=>4000
+,p_attribute_02=>'VALUE'
+,p_attribute_05=>'PLAIN'
 ,p_enable_filter=>true
 ,p_filter_operators=>'C:S:CASE_INSENSITIVE:REGEXP'
 ,p_filter_is_required=>false
@@ -733,7 +933,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_DISPLAY_ONLY'
 ,p_heading=>'Pages'
 ,p_heading_alignment=>'RIGHT'
-,p_display_sequence=>50
+,p_display_sequence=>80
 ,p_value_alignment=>'RIGHT'
 ,p_group_id=>wwv_flow_api.id(9809400623099811)
 ,p_use_group_for=>'BOTH'
@@ -758,21 +958,15 @@ wwv_flow_api.create_region_column(
 ,p_source_expression=>'AUTH_PROCEDURE'
 ,p_data_type=>'VARCHAR2'
 ,p_is_query_only=>false
-,p_item_type=>'NATIVE_TEXT_FIELD'
+,p_item_type=>'NATIVE_HTML_EXPRESSION'
 ,p_heading=>'Matching Procedure'
 ,p_heading_alignment=>'LEFT'
-,p_display_sequence=>40
+,p_display_sequence=>50
 ,p_value_alignment=>'LEFT'
 ,p_group_id=>wwv_flow_api.id(9809200756099809)
 ,p_use_group_for=>'BOTH'
-,p_attribute_05=>'BOTH'
-,p_is_required=>false
-,p_max_length=>257
-,p_enable_filter=>true
-,p_filter_operators=>'C:S:CASE_INSENSITIVE:REGEXP'
+,p_attribute_01=>'<span class="&AUTH_PROCEDURE_ICON."></span>&AUTH_PROCEDURE.'
 ,p_filter_is_required=>false
-,p_filter_text_case=>'MIXED'
-,p_filter_lov_type=>'NONE'
 ,p_use_as_row_header=>false
 ,p_enable_sort_group=>true
 ,p_enable_control_break=>true
@@ -791,7 +985,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_SINGLE_CHECKBOX'
 ,p_heading=>'Session'
 ,p_heading_alignment=>'CENTER'
-,p_display_sequence=>80
+,p_display_sequence=>110
 ,p_value_alignment=>'CENTER'
 ,p_group_id=>wwv_flow_api.id(9809390285099810)
 ,p_use_group_for=>'BOTH'
@@ -822,7 +1016,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_SINGLE_CHECKBOX'
 ,p_heading=>'Page View'
 ,p_heading_alignment=>'CENTER'
-,p_display_sequence=>90
+,p_display_sequence=>120
 ,p_value_alignment=>'CENTER'
 ,p_group_id=>wwv_flow_api.id(9809390285099810)
 ,p_use_group_for=>'BOTH'
@@ -853,7 +1047,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_SINGLE_CHECKBOX'
 ,p_heading=>'Component'
 ,p_heading_alignment=>'CENTER'
-,p_display_sequence=>100
+,p_display_sequence=>130
 ,p_value_alignment=>'CENTER'
 ,p_group_id=>wwv_flow_api.id(9809390285099810)
 ,p_use_group_for=>'BOTH'
@@ -884,7 +1078,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_SINGLE_CHECKBOX'
 ,p_heading=>'No Cache'
 ,p_heading_alignment=>'CENTER'
-,p_display_sequence=>110
+,p_display_sequence=>140
 ,p_value_alignment=>'CENTER'
 ,p_group_id=>wwv_flow_api.id(9809390285099810)
 ,p_use_group_for=>'BOTH'
@@ -915,7 +1109,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_DISPLAY_ONLY'
 ,p_heading=>'Regions'
 ,p_heading_alignment=>'RIGHT'
-,p_display_sequence=>60
+,p_display_sequence=>90
 ,p_value_alignment=>'RIGHT'
 ,p_group_id=>wwv_flow_api.id(9809400623099811)
 ,p_use_group_for=>'BOTH'
@@ -932,6 +1126,18 @@ wwv_flow_api.create_region_column(
 ,p_duplicate_value=>true
 ,p_include_in_export=>true
 );
+wwv_flow_api.component_end;
+end;
+/
+begin
+wwv_flow_api.component_begin (
+ p_version_yyyy_mm_dd=>'2021.04.15'
+,p_release=>'21.1.6'
+,p_default_workspace_id=>9014660246496943
+,p_default_application_id=>770
+,p_default_id_offset=>0
+,p_default_owner=>'CORE'
+);
 wwv_flow_api.create_region_column(
  p_id=>wwv_flow_api.id(9964641560802045)
 ,p_name=>'COUNT_USERS'
@@ -942,7 +1148,7 @@ wwv_flow_api.create_region_column(
 ,p_item_type=>'NATIVE_DISPLAY_ONLY'
 ,p_heading=>'Users'
 ,p_heading_alignment=>'RIGHT'
-,p_display_sequence=>70
+,p_display_sequence=>100
 ,p_value_alignment=>'RIGHT'
 ,p_group_id=>wwv_flow_api.id(9809400623099811)
 ,p_use_group_for=>'BOTH'
@@ -961,6 +1167,153 @@ wwv_flow_api.create_region_column(
 ,p_duplicate_value=>true
 ,p_include_in_export=>true
 );
+wwv_flow_api.create_region_column(
+ p_id=>wwv_flow_api.id(10889945447121608)
+,p_name=>'ROLE_ID'
+,p_source_type=>'DB_COLUMN'
+,p_source_expression=>'ROLE_ID'
+,p_data_type=>'VARCHAR2'
+,p_is_query_only=>false
+,p_item_type=>'NATIVE_DISPLAY_ONLY'
+,p_heading=>'Role Id'
+,p_heading_alignment=>'LEFT'
+,p_display_sequence=>10
+,p_value_alignment=>'LEFT'
+,p_group_id=>wwv_flow_api.id(10890534130121614)
+,p_use_group_for=>'BOTH'
+,p_attribute_02=>'VALUE'
+,p_attribute_05=>'PLAIN'
+,p_enable_filter=>true
+,p_filter_operators=>'C:S:CASE_INSENSITIVE:REGEXP'
+,p_filter_is_required=>false
+,p_filter_text_case=>'MIXED'
+,p_filter_exact_match=>true
+,p_filter_lov_type=>'DISTINCT'
+,p_use_as_row_header=>false
+,p_enable_sort_group=>true
+,p_enable_control_break=>true
+,p_enable_hide=>true
+,p_is_primary_key=>false
+,p_duplicate_value=>true
+,p_include_in_export=>true
+);
+wwv_flow_api.create_region_column(
+ p_id=>wwv_flow_api.id(10890001266121609)
+,p_name=>'ROLE_GROUP'
+,p_source_type=>'DB_COLUMN'
+,p_source_expression=>'ROLE_GROUP'
+,p_data_type=>'VARCHAR2'
+,p_is_query_only=>false
+,p_item_type=>'NATIVE_DISPLAY_ONLY'
+,p_heading=>'Role Group'
+,p_heading_alignment=>'LEFT'
+,p_display_sequence=>20
+,p_value_alignment=>'LEFT'
+,p_group_id=>wwv_flow_api.id(10890534130121614)
+,p_use_group_for=>'BOTH'
+,p_attribute_02=>'VALUE'
+,p_attribute_05=>'PLAIN'
+,p_enable_filter=>true
+,p_filter_operators=>'C:S:CASE_INSENSITIVE:REGEXP'
+,p_filter_is_required=>false
+,p_filter_text_case=>'MIXED'
+,p_filter_exact_match=>true
+,p_filter_lov_type=>'DISTINCT'
+,p_use_as_row_header=>false
+,p_enable_sort_group=>true
+,p_enable_control_break=>true
+,p_enable_hide=>true
+,p_is_primary_key=>false
+,p_duplicate_value=>true
+,p_include_in_export=>true
+);
+wwv_flow_api.create_region_column(
+ p_id=>wwv_flow_api.id(10890168607121610)
+,p_name=>'AUTH_SCHEME_ICON'
+,p_source_type=>'DB_COLUMN'
+,p_source_expression=>'AUTH_SCHEME_ICON'
+,p_data_type=>'VARCHAR2'
+,p_is_query_only=>false
+,p_item_type=>'NATIVE_HIDDEN'
+,p_display_sequence=>40
+,p_attribute_01=>'Y'
+,p_use_as_row_header=>false
+,p_enable_sort_group=>true
+,p_enable_control_break=>true
+,p_is_primary_key=>false
+,p_duplicate_value=>true
+,p_include_in_export=>false
+);
+wwv_flow_api.create_region_column(
+ p_id=>wwv_flow_api.id(10890242854121611)
+,p_name=>'AUTH_PROCEDURE_ICON'
+,p_source_type=>'DB_COLUMN'
+,p_source_expression=>'AUTH_PROCEDURE_ICON'
+,p_data_type=>'VARCHAR2'
+,p_is_query_only=>false
+,p_item_type=>'NATIVE_HIDDEN'
+,p_display_sequence=>60
+,p_attribute_01=>'Y'
+,p_use_as_row_header=>false
+,p_enable_sort_group=>true
+,p_enable_control_break=>true
+,p_is_primary_key=>false
+,p_duplicate_value=>true
+,p_include_in_export=>false
+);
+wwv_flow_api.create_region_column(
+ p_id=>wwv_flow_api.id(10890324065121612)
+,p_name=>'AUTH_SOURCE_CODE'
+,p_source_type=>'DB_COLUMN'
+,p_source_expression=>'AUTH_SOURCE_CODE'
+,p_data_type=>'VARCHAR2'
+,p_is_query_only=>false
+,p_item_type=>'NATIVE_DISPLAY_ONLY'
+,p_heading=>'Source Code'
+,p_heading_alignment=>'LEFT'
+,p_display_sequence=>70
+,p_value_alignment=>'LEFT'
+,p_group_id=>wwv_flow_api.id(9809200756099809)
+,p_use_group_for=>'BOTH'
+,p_attribute_02=>'VALUE'
+,p_attribute_05=>'PLAIN'
+,p_enable_filter=>true
+,p_filter_operators=>'C:S:CASE_INSENSITIVE:REGEXP'
+,p_filter_is_required=>false
+,p_filter_text_case=>'MIXED'
+,p_filter_lov_type=>'NONE'
+,p_use_as_row_header=>false
+,p_enable_sort_group=>false
+,p_enable_hide=>true
+,p_is_primary_key=>false
+,p_duplicate_value=>true
+,p_include_in_export=>true
+);
+wwv_flow_api.create_region_column(
+ p_id=>wwv_flow_api.id(10890672836121615)
+,p_name=>'ORDER#'
+,p_source_type=>'DB_COLUMN'
+,p_source_expression=>'ORDER#'
+,p_data_type=>'NUMBER'
+,p_is_query_only=>false
+,p_item_type=>'NATIVE_DISPLAY_ONLY'
+,p_heading=>'Order#'
+,p_heading_alignment=>'LEFT'
+,p_display_sequence=>160
+,p_value_alignment=>'LEFT'
+,p_attribute_02=>'VALUE'
+,p_attribute_05=>'PLAIN'
+,p_enable_filter=>true
+,p_filter_is_required=>false
+,p_filter_lov_type=>'NONE'
+,p_use_as_row_header=>false
+,p_enable_sort_group=>true
+,p_enable_control_break=>true
+,p_enable_hide=>true
+,p_is_primary_key=>false
+,p_duplicate_value=>true
+,p_include_in_export=>true
+);
 wwv_flow_api.create_interactive_grid(
  p_id=>wwv_flow_api.id(9719050657455643)
 ,p_internal_uid=>9719050657455643
@@ -991,7 +1344,7 @@ wwv_flow_api.create_ig_report(
 ,p_type=>'PRIMARY'
 ,p_default_view=>'GRID'
 ,p_show_row_number=>false
-,p_settings_area_expanded=>true
+,p_settings_area_expanded=>false
 );
 wwv_flow_api.create_ig_report_view(
  p_id=>wwv_flow_api.id(9814223779101180)
@@ -1003,30 +1356,32 @@ wwv_flow_api.create_ig_report_view(
 ,p_edit_mode=>false
 );
 wwv_flow_api.create_ig_report_column(
- p_id=>wwv_flow_api.id(9814707172101182)
+ p_id=>wwv_flow_api.id(3421853826929)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>0
-,p_column_id=>wwv_flow_api.id(9719130728455644)
+,p_display_seq=>16
+,p_column_id=>wwv_flow_api.id(10890672836121615)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>242
 ,p_sort_order=>1
 ,p_sort_direction=>'ASC'
 ,p_sort_nulls=>'LAST'
 );
 wwv_flow_api.create_ig_report_column(
- p_id=>wwv_flow_api.id(9816558342101186)
+ p_id=>wwv_flow_api.id(9814707172101182)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>1
-,p_column_id=>wwv_flow_api.id(9719317337455646)
+,p_display_seq=>3
+,p_column_id=>wwv_flow_api.id(9719130728455644)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>412
+,p_width=>240
+,p_sort_order=>3
+,p_sort_direction=>'ASC'
+,p_sort_nulls=>'LAST'
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9818234870101190)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>7
+,p_display_seq=>9
 ,p_column_id=>wwv_flow_api.id(9719540926455648)
 ,p_is_visible=>false
 ,p_is_frozen=>false
@@ -1034,74 +1389,123 @@ wwv_flow_api.create_ig_report_column(
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9820050043101195)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>3
+,p_display_seq=>5
 ,p_column_id=>wwv_flow_api.id(9719779128455650)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>91
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9826382687221369)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>2
+,p_display_seq=>3
 ,p_column_id=>wwv_flow_api.id(9808640661099803)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>259
+,p_width=>280
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9846744978528029)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>6
+,p_display_seq=>8
 ,p_column_id=>wwv_flow_api.id(9808883973099805)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>120
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9847614433528032)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>8
+,p_display_seq=>10
 ,p_column_id=>wwv_flow_api.id(9808972844099806)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>120
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9848505106528035)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>9
+,p_display_seq=>11
 ,p_column_id=>wwv_flow_api.id(9809055297099807)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>125
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(9849488200528038)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>10
+,p_display_seq=>12
 ,p_column_id=>wwv_flow_api.id(9809197061099808)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>129
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(10189865304519751)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>4
+,p_display_seq=>6
 ,p_column_id=>wwv_flow_api.id(9964521125802044)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>105
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(10190783311519756)
 ,p_view_id=>wwv_flow_api.id(9814223779101180)
-,p_display_seq=>5
+,p_display_seq=>7
 ,p_column_id=>wwv_flow_api.id(9964641560802045)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>94
+,p_width=>90
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(11016971490000638)
+,p_view_id=>wwv_flow_api.id(9814223779101180)
+,p_display_seq=>1
+,p_column_id=>wwv_flow_api.id(10889945447121608)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>240
+,p_sort_order=>2
+,p_sort_direction=>'ASC'
+,p_sort_nulls=>'LAST'
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(11017892838000641)
+,p_view_id=>wwv_flow_api.id(9814223779101180)
+,p_display_seq=>1
+,p_column_id=>wwv_flow_api.id(10890001266121609)
+,p_is_visible=>false
+,p_is_frozen=>false
+,p_break_order=>5
+,p_break_is_enabled=>true
+,p_break_sort_direction=>'ASC'
+,p_break_sort_nulls=>'LAST'
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(11018722417000645)
+,p_view_id=>wwv_flow_api.id(9814223779101180)
+,p_display_seq=>14
+,p_column_id=>wwv_flow_api.id(10890168607121610)
+,p_is_visible=>true
+,p_is_frozen=>false
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(11019679764000648)
+,p_view_id=>wwv_flow_api.id(9814223779101180)
+,p_display_seq=>15
+,p_column_id=>wwv_flow_api.id(10890242854121611)
+,p_is_visible=>true
+,p_is_frozen=>false
+);
+wwv_flow_api.create_ig_report_column(
+ p_id=>wwv_flow_api.id(11020556617000650)
+,p_view_id=>wwv_flow_api.id(9814223779101180)
+,p_display_seq=>4
+,p_column_id=>wwv_flow_api.id(10890324065121612)
+,p_is_visible=>true
+,p_is_frozen=>false
+,p_width=>360
 );
 wwv_flow_api.create_page_plug(
  p_id=>wwv_flow_api.id(9904026934658832)
@@ -1159,18 +1563,6 @@ wwv_flow_api.create_page_plug(
 ,p_prn_page_footer_alignment=>'CENTER'
 ,p_prn_border_color=>'#666666'
 );
-wwv_flow_api.component_end;
-end;
-/
-begin
-wwv_flow_api.component_begin (
- p_version_yyyy_mm_dd=>'2021.04.15'
-,p_release=>'21.1.6'
-,p_default_workspace_id=>9014660246496943
-,p_default_application_id=>770
-,p_default_id_offset=>0
-,p_default_owner=>'CORE'
-);
 wwv_flow_api.create_region_column(
  p_id=>wwv_flow_api.id(9904213902658834)
 ,p_name=>'ROW#'
@@ -1883,6 +2275,18 @@ wwv_flow_api.create_region_column(
 ,p_display_condition_type=>'ITEM_IS_NOT_NULL'
 ,p_display_condition=>'P920_C024'
 );
+wwv_flow_api.component_end;
+end;
+/
+begin
+wwv_flow_api.component_begin (
+ p_version_yyyy_mm_dd=>'2021.04.15'
+,p_release=>'21.1.6'
+,p_default_workspace_id=>9014660246496943
+,p_default_application_id=>770
+,p_default_id_offset=>0
+,p_default_owner=>'CORE'
+);
 wwv_flow_api.create_region_column(
  p_id=>wwv_flow_api.id(9961056128802009)
 ,p_name=>'C025'
@@ -2318,18 +2722,6 @@ wwv_flow_api.create_region_column(
 ,p_display_condition_type=>'ITEM_IS_NOT_NULL'
 ,p_display_condition=>'P920_C039'
 );
-wwv_flow_api.component_end;
-end;
-/
-begin
-wwv_flow_api.component_begin (
- p_version_yyyy_mm_dd=>'2021.04.15'
-,p_release=>'21.1.6'
-,p_default_workspace_id=>9014660246496943
-,p_default_application_id=>770
-,p_default_id_offset=>0
-,p_default_owner=>'CORE'
-);
 wwv_flow_api.create_region_column(
  p_id=>wwv_flow_api.id(9962591391802024)
 ,p_name=>'C040'
@@ -2723,7 +3115,7 @@ wwv_flow_api.create_ig_report_column(
 ,p_column_id=>wwv_flow_api.id(9904363099658835)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>320
+,p_width=>300
 ,p_sort_order=>1
 ,p_sort_direction=>'ASC'
 ,p_sort_nulls=>'LAST'
@@ -3024,6 +3416,18 @@ wwv_flow_api.create_ig_report_column(
 ,p_is_visible=>true
 ,p_is_frozen=>false
 );
+wwv_flow_api.component_end;
+end;
+/
+begin
+wwv_flow_api.component_begin (
+ p_version_yyyy_mm_dd=>'2021.04.15'
+,p_release=>'21.1.6'
+,p_default_workspace_id=>9014660246496943
+,p_default_application_id=>770
+,p_default_id_offset=>0
+,p_default_owner=>'CORE'
+);
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(10001530144802555)
 ,p_view_id=>wwv_flow_api.id(9966073400802454)
@@ -3126,7 +3530,7 @@ wwv_flow_api.create_ig_report_column(
 ,p_display_seq=>0
 ,p_column_id=>wwv_flow_api.id(9963828000802037)
 ,p_is_visible=>true
-,p_is_frozen=>false
+,p_is_frozen=>true
 );
 wwv_flow_api.create_page_plug(
  p_id=>wwv_flow_api.id(9809769330099814)
@@ -3274,27 +3678,6 @@ wwv_flow_api.create_region_column(
 ,p_duplicate_value=>true
 ,p_include_in_export=>true
 );
-wwv_flow_api.create_region_column(
- p_id=>wwv_flow_api.id(10750723171850247)
-,p_name=>'AUTH_SCHEME'
-,p_source_type=>'DB_COLUMN'
-,p_source_expression=>'AUTH_SCHEME'
-,p_data_type=>'VARCHAR2'
-,p_is_query_only=>true
-,p_item_type=>'NATIVE_HTML_EXPRESSION'
-,p_heading=>'Auth Scheme'
-,p_heading_alignment=>'CENTER'
-,p_display_sequence=>40
-,p_value_alignment=>'CENTER'
-,p_attribute_01=>'<span class="&AUTH_SCHEME."></span>'
-,p_filter_is_required=>false
-,p_use_as_row_header=>false
-,p_enable_sort_group=>true
-,p_enable_control_break=>true
-,p_enable_hide=>true
-,p_is_primary_key=>false
-,p_include_in_export=>true
-);
 wwv_flow_api.create_region_column(
  p_id=>wwv_flow_api.id(10750934455850249)
 ,p_name=>'COUNT_USERS'
@@ -3442,18 +3825,6 @@ wwv_flow_api.create_region_column(
 ,p_is_primary_key=>false
 ,p_include_in_export=>false
 );
-wwv_flow_api.component_end;
-end;
-/
-begin
-wwv_flow_api.component_begin (
- p_version_yyyy_mm_dd=>'2021.04.15'
-,p_release=>'21.1.6'
-,p_default_workspace_id=>9014660246496943
-,p_default_application_id=>770
-,p_default_id_offset=>0
-,p_default_owner=>'CORE'
-);
 wwv_flow_api.create_region_column(
  p_id=>wwv_flow_api.id(19159549887813934)
 ,p_name=>'UPDATED_AT'
@@ -3547,29 +3918,29 @@ wwv_flow_api.create_ig_report_view(
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(3353938009283)
 ,p_view_id=>wwv_flow_api.id(19171278820973961)
-,p_display_seq=>8
+,p_display_seq=>4
 ,p_column_id=>wwv_flow_api.id(9964169672802040)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>282
+,p_width=>280
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(26239087122099)
 ,p_view_id=>wwv_flow_api.id(19171278820973961)
-,p_display_seq=>7
+,p_display_seq=>6
 ,p_column_id=>wwv_flow_api.id(10750934455850249)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>95
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(10014422896212298)
 ,p_view_id=>wwv_flow_api.id(19171278820973961)
-,p_display_seq=>13
+,p_display_seq=>11
 ,p_column_id=>wwv_flow_api.id(9963733831802036)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>106
+,p_width=>90
 ,p_sort_order=>1
 ,p_sort_direction=>'ASC'
 ,p_sort_nulls=>'LAST'
@@ -3587,15 +3958,6 @@ wwv_flow_api.create_ig_report_column(
 ,p_break_sort_direction=>'ASC'
 ,p_break_sort_nulls=>'LAST'
 );
-wwv_flow_api.create_ig_report_column(
- p_id=>wwv_flow_api.id(10813788766844394)
-,p_view_id=>wwv_flow_api.id(19171278820973961)
-,p_display_seq=>6
-,p_column_id=>wwv_flow_api.id(10750723171850247)
-,p_is_visible=>true
-,p_is_frozen=>false
-,p_width=>99
-);
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(19171770412973969)
 ,p_view_id=>wwv_flow_api.id(19171278820973961)
@@ -3607,11 +3969,11 @@ wwv_flow_api.create_ig_report_column(
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(19172611973973977)
 ,p_view_id=>wwv_flow_api.id(19171278820973961)
-,p_display_seq=>4
+,p_display_seq=>3
 ,p_column_id=>wwv_flow_api.id(19159186422813930)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>286
+,p_width=>280
 ,p_sort_order=>2
 ,p_sort_direction=>'ASC'
 ,p_sort_nulls=>'LAST'
@@ -3619,25 +3981,24 @@ wwv_flow_api.create_ig_report_column(
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(19173547925973982)
 ,p_view_id=>wwv_flow_api.id(19171278820973961)
-,p_display_seq=>11
+,p_display_seq=>8
 ,p_column_id=>wwv_flow_api.id(19159243544813931)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>483
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(19174417976973987)
 ,p_view_id=>wwv_flow_api.id(19171278820973961)
-,p_display_seq=>12
+,p_display_seq=>10
 ,p_column_id=>wwv_flow_api.id(19159373969813932)
 ,p_is_visible=>true
 ,p_is_frozen=>false
-,p_width=>106
+,p_width=>90
 );
 wwv_flow_api.create_ig_report_column(
  p_id=>wwv_flow_api.id(19175344622973991)
 ,p_view_id=>wwv_flow_api.id(19171278820973961)
-,p_display_seq=>5
+,p_display_seq=>7
 ,p_column_id=>wwv_flow_api.id(19159459207813933)
 ,p_is_visible=>true
 ,p_is_frozen=>false
@@ -4175,6 +4536,18 @@ wwv_flow_api.create_page_item(
 ,p_attribute_04=>'TEXT'
 ,p_attribute_05=>'BOTH'
 );
+wwv_flow_api.component_end;
+end;
+/
+begin
+wwv_flow_api.component_begin (
+ p_version_yyyy_mm_dd=>'2021.04.15'
+,p_release=>'21.1.6'
+,p_default_workspace_id=>9014660246496943
+,p_default_application_id=>770
+,p_default_id_offset=>0
+,p_default_owner=>'CORE'
+);
 wwv_flow_api.create_page_item(
  p_id=>wwv_flow_api.id(9810805376099825)
 ,p_name=>'P920_C008'
@@ -4569,18 +4942,6 @@ wwv_flow_api.create_page_item(
 ,p_attribute_04=>'TEXT'
 ,p_attribute_05=>'BOTH'
 );
-wwv_flow_api.component_end;
-end;
-/
-begin
-wwv_flow_api.component_begin (
- p_version_yyyy_mm_dd=>'2021.04.15'
-,p_release=>'21.1.6'
-,p_default_workspace_id=>9014660246496943
-,p_default_application_id=>770
-,p_default_id_offset=>0
-,p_default_owner=>'CORE'
-);
 wwv_flow_api.create_page_item(
  p_id=>wwv_flow_api.id(9812614096099843)
 ,p_name=>'P920_C026'
@@ -5311,6 +5672,18 @@ wwv_flow_api.create_page_process(
 ,p_attribute_06=>'N'
 ,p_error_display_location=>'INLINE_IN_NOTIFICATION'
 );
+wwv_flow_api.component_end;
+end;
+/
+begin
+wwv_flow_api.component_begin (
+ p_version_yyyy_mm_dd=>'2021.04.15'
+,p_release=>'21.1.6'
+,p_default_workspace_id=>9014660246496943
+,p_default_application_id=>770
+,p_default_id_offset=>0
+,p_default_owner=>'CORE'
+);
 wwv_flow_api.create_page_process(
  p_id=>wwv_flow_api.id(9608185962232328)
 ,p_process_sequence=>30
diff --git a/views/roles_auth_schemes.sql b/views/roles_auth_schemes.sql
index bacca26..442da47 100644
--- a/views/roles_auth_schemes.sql
+++ b/views/roles_auth_schemes.sql
@@ -1,20 +1,31 @@
 CREATE OR REPLACE VIEW roles_auth_schemes AS
 SELECT
-    a.authorization_scheme_name         AS auth_scheme,
-    MAX(a.attribute_01)                 AS auth_source,
+    MAX(r.role_id)                          AS role_id,
+    MAX(r.role_group)                       AS role_group,
+    --
+    a.authorization_scheme_name             AS auth_scheme,
+    NULL                                    AS auth_scheme_icon,
     --
     MAX(LTRIM(s.object_name || '.' || s.procedure_name, '.')) AS auth_procedure,
     --
+    CASE
+        WHEN MAX(s.procedure_name) IS NULL AND a.authorization_scheme_name NOT IN ('NOBODY')
+            THEN 'fa fa-warning'
+        END AS auth_procedure_icon,
+
+    MAX(a.attribute_01)                     AS auth_source_code,
+    --
     NULLIF(COUNT(DISTINCT p.page_id), 0)    AS count_pages,
     NULLIF(COUNT(DISTINCT g.region_id), 0)  AS count_regions,
     NULLIF(COUNT(DISTINCT u.user_id), 0)    AS count_users,
     --
-    MAX(CASE WHEN a.caching = 'Once per session'    THEN 'Y' END) AS cache_session,
-    MAX(CASE WHEN a.caching = 'Once per page view'  THEN 'Y' END) AS cache_page_view,
-    MAX(CASE WHEN a.caching = 'BY_COMPONENT'        THEN 'Y' END) AS cache_component,
-    MAX(CASE WHEN a.caching = 'NOCACHE'             THEN 'Y' END) AS cache_no,
+    MAX(CASE WHEN a.caching = 'Once per session'    THEN 'Y' END)   AS cache_session,
+    MAX(CASE WHEN a.caching = 'Once per page view'  THEN 'Y' END)   AS cache_page_view,
+    MAX(CASE WHEN a.caching = 'BY_COMPONENT'        THEN 'Y' END)   AS cache_component,
+    MAX(CASE WHEN a.caching = 'NOCACHE'             THEN 'Y' END)   AS cache_no,
     --
-    MAX(a.error_message)                AS error_message
+    MAX(a.error_message)                                            AS error_message,
+    TO_CHAR(MAX(r.order#)) || a.authorization_scheme_name           AS sort#
 FROM apex_application_authorization a
 LEFT JOIN apex_application_pages p
     ON p.application_id                 = a.application_id
@@ -31,5 +42,40 @@ LEFT JOIN user_procedures s
     ON s.procedure_name                 = a.authorization_scheme_name
     AND UPPER(a.attribute_01)           LIKE '%' || s.object_name || '.' || s.procedure_name || '%'
 WHERE a.application_id                  = app.get_app_id()
-GROUP BY a.authorization_scheme_name;
+GROUP BY a.authorization_scheme_name
+UNION ALL
+--
+SELECT
+    r.role_id,
+    r.role_group,
+    --
+    NULL                                AS auth_scheme,
+    'fa fa-warning'                     AS auth_scheme_icon,
+    NULL                                AS auth_procedure,
+    'fa fa-warning'                     AS auth_procedure_icon,
+    NULL                                AS auth_source_code,
+    NULL                                AS count_pages,
+    NULL                                AS count_regions,
+    u.count_users                       AS count_users,
+    NULL                                AS cache_session,
+    NULL                                AS cache_page_view,
+    NULL                                AS cache_component,
+    NULL                                AS cache_no,
+    NULL                                AS error_message,
+    TO_CHAR(r.order#) || r.role_id      AS sort#
+FROM roles r
+LEFT JOIN apex_application_authorization a
+    ON a.application_id                 = r.app_id
+    AND a.authorization_scheme_name     = r.role_id
+LEFT JOIN (
+    SELECT
+        u.role_id,
+        COUNT(*)        AS count_users
+    FROM user_roles u
+    WHERE u.app_id      = app.get_app_id()
+    GROUP BY u.role_id
+) u
+    ON u.role_id                        = r.role_id
+WHERE r.app_id                          = app.get_app_id()
+    AND a.authorization_scheme_name     IS NULL;
 
diff --git a/views/roles_overview.sql b/views/roles_overview.sql
index ab07f5b..05b8aae 100644
--- a/views/roles_overview.sql
+++ b/views/roles_overview.sql
@@ -2,8 +2,6 @@ CREATE OR REPLACE VIEW roles_overview AS
 SELECT
     r.app_id,
     --
-    CASE WHEN a.auth_scheme IS NULL THEN 'fa fa-warning' END AS auth_scheme,
-    --
     u.count_users,
     --
     r.role_id,
@@ -15,16 +13,14 @@ SELECT
     r.updated_by,
     r.updated_at
 FROM roles r
-LEFT JOIN roles_auth_schemes a
-    ON a.auth_scheme = r.role_id
 LEFT JOIN (
     SELECT
         u.role_id,
-        COUNT(*) AS count_users
+        COUNT(*)        AS count_users
     FROM user_roles u
-    WHERE u.app_id = app.get_app_id()
+    WHERE u.app_id      = app.get_app_id()
     GROUP BY u.role_id
 ) u
-    ON u.role_id = r.role_id
-WHERE r.app_id = app.get_app_id();
+    ON u.role_id        = r.role_id
+WHERE r.app_id          = app.get_app_id();