consolidating dashboard_ui into master