Con 1656

please create separate group for `ui_components` and add it here