diff --git a/.env.sample b/.env.sample
index 94f4a336b4..6a8e41d243 100644
--- a/.env.sample
+++ b/.env.sample
@@ -39,5 +39,3 @@ OP_API_URL="https://data.bioontology.org"
 API_IMAGE_REPOSITORY=agroportal
 ## Image tag/version from which the ontoportal api will be built
 API_IMAGE_TAG=master
-
-
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ba29bcf47..7562e32730 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -162,7 +162,7 @@ GEM
     ed25519 (1.3.0)
     erubi (1.13.0)
     erubis (2.7.0)
-    excon (1.0.0)
+    excon (0.112.0)
     execjs (2.10.0)
     faraday (2.0.1)
       faraday-net_http (~> 2.0)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1a42c65807..52e60fbadd 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,13 +12,9 @@
 //
 //= require bioportal
 //= require admin/licenses
-//= require bp_ajax_controller
-//= require bp_notes
 //= require bp_form_complete
 //= require bp_admin
 //= require concepts
 //= require projects
 //= require Chart.min
 //= require application_esbuild
-
-
diff --git a/app/assets/javascripts/bp_ajax_controller.js b/app/assets/javascripts/bp_ajax_controller.js
deleted file mode 100644
index a67e66550a..0000000000
--- a/app/assets/javascripts/bp_ajax_controller.js
+++ /dev/null
@@ -1,187 +0,0 @@
-
-"use strict";
-
-// Note similar code in concepts_helper.rb mirrors the following code:
-function bp_ont_link(ont_acronym){
-  return "/ontologies/" + ont_acronym;
-}
-function bp_cls_link(cls_id, ont_acronym){
-  return bp_ont_link(ont_acronym) + "?p=classes&conceptid=" + encodeURIComponent(cls_id);
-}
-function get_link_for_cls_ajax(cls_id, ont_acronym) {
-  // ajax call will replace the class label using data attributes (triggered by class='cls4ajax')
-    let ajax_uri = '/ajax/classes/label'
-    let data_cls = `data-label-ajax-cls-id-value='${cls_id}' `
-    let data_ont = `data-label-ajax-ontology-acronym-value='${ont_acronym}'`
-    let data_ajax_uri = `data-label-ajax-ajax-uri-value='${ajax_uri}' `
-
-    let data = `data-controller='label-ajax' ${data_ont} ${data_cls} ${data_ajax_uri}`
-
-    return `<a  ${data} href="${bp_cls_link(cls_id, ont_acronym)}">${cls_id}</a>`
-}
-
-function get_link_for_ont_ajax(ont_acronym) {
-  var data_ont = " data-ont='" + ont_acronym + "' ";
-  return "<a class='ont4ajax'" + data_ont + "href='" + bp_ont_link(ont_acronym) + "'>" + ont_acronym + "</a>";
-}
-
-var
-  ajax_process_interportal_cls_interval = null,
-  ajax_process_ont_interval = null,
-  ajax_process_timeout = 20, // Timeout after 20 sec.
-  ajax_process_timing = 250; // It takes about 250 msec to resolve a class ID to a prefLabel
-
-var ajax_process_init = function () {
-  ajax_process_ont_init();
-  ajax_process_interportal_cls_init();
-};
-
-var ajax_process_halt = function () {
-  ajax_process_ont_halt();
-  ajax_process_interportal_cls_halt();
-};
-
-
-// **************************************************************************************
-// ONTOLOGY NAMES
-
-// Note: If we don't query every time, using the array should be faster; it
-//       means the ajax_ont_init must be called after all the elements
-//       are created because they will not be detected in a dynamic iteration.
-var ajax_ont_array = [];
-var ajax_process_ont_init = function() {
-  ajax_ont_array = jQuery("a.ont4ajax").toArray();
-  ajax_process_ont_interval = window.setInterval(ajax_process_ont, ajax_process_timing);
-};
-var ajax_process_ont_halt = function () {
-  ajax_ont_array = [];
-  window.clearInterval(ajax_process_ont_interval); // stop the ajax process
-  // Note: might leave faulty href links, but it usually means moving on to entirely different content
-  //       so it's not likely those links will be available for interaction.
-  // clear all the classes and ontologies to be resolved by ajax
-  //jQuery("a.ont4ajax").removeClass('ont4ajax');
-  //jQuery("a.ajax-modified-ont").removeClass('ajax-modified-ont');
-};
-var ajax_process_ont = function() {
-  if( ajax_ont_array.length === 0 ){
-    ajax_process_ont_halt();
-    return true;
-  }
-  // Note: If we don't query every time, using the array should be faster; it
-  //       means the ajax_ont_init must be called after all the elements
-  //       are created because they will not be detected in a dynamic iteration.
-  //var linkA = jQuery("a.ont4ajax").first();
-  var linkA = ajax_ont_array.shift();
-  if(linkA === undefined){
-    return true;
-  }
-  linkA = jQuery(linkA);
-  if(linkA.hasClass('ajax-modified-ont') ){
-    // How did we get here? It should not have the ont4ajax class!
-    linkA.removeClass('ont4ajax');
-    return true; // processed this one already.
-  }
-  linkA.removeClass('ont4ajax'); // processing this one.
-  var ont_acronym = linkA.attr('data-ont');
-  var ajax_uri = "/ajax/json_ontology/?ontology=" + encodeURIComponent(ont_acronym);
-  jQuery.ajax({
-    url: ajax_uri,
-    timeout: ajax_process_timeout * 1000,
-    success: function(data){
-      if(typeof data !== "undefined" && data.hasOwnProperty('name')){
-        var ont_name = data.name;
-        linkA.text(ont_name);
-        linkA.addClass('ajax-modified-ont'); // processed this one.
-        // find and process any identical ontologies
-        jQuery('a[href="/ontologies/' + data.acronym + '"]').each(function(i,e){
-          var link = jQuery(this);
-          if(! link.hasClass('ajax-modified-ont') ){
-            link.removeClass('ont4ajax');   // processing this one.
-            link.text(ont_name);
-            link.addClass('ajax-modified-ont'); // processed this one.
-          }
-        });
-      }
-    },
-    error: function(data){
-      linkA.addClass('ajax-error'); // processed this one.
-    }
-  });
-};
-
-
-// **************************************************************************************
-// INTERPORTAL CLASS LABELS
-
-// Note: If we don't query every time, using the array should be faster; it
-//       means the ajax_process_init must be called after all the elements
-//       are created because they will not be detected in a dynamic iteration.
-var ajax_interportal_cls_array = [];
-
-var ajax_process_interportal_cls_init = function() {
-    ajax_interportal_cls_array = jQuery("a.interportalcls4ajax").toArray();
-    ajax_process_interportal_cls_interval = window.setInterval(ajax_process_interportal_cls, ajax_process_timing);
-};
-
-var ajax_process_interportal_cls_halt = function () {
-    ajax_interportal_cls_array = [];
-    window.clearInterval(ajax_process_interportal_cls_interval); // stop the ajax process
-    // Note: might leave faulty href links, but it usually means moving on to entirely different content
-    //       so it's not likely those links will be available for interaction.
-    // clear all the classes and ontologies to be resolved by ajax
-    //jQuery("a.cls4ajax").removeClass('cls4ajax');
-    //jQuery("a.ajax-modified-cls").removeClass('ajax-modified-cls');
-};
-
-var ajax_process_interportal_cls = function() {
-    // Check on whether to stop the ajax process
-    if( ajax_interportal_cls_array.length === 0 ){
-        ajax_process_interportal_cls_halt();
-        return true;
-    }
-    // Note: If we don't query every time, using the array should be faster; it
-    //       means the ajax_process_init must be called after all the elements
-    //       are created because they will not be detected in a dynamic iteration.
-    //var linkA = jQuery("a.cls4ajax").first();
-    var linkA = ajax_interportal_cls_array.shift(); // put first item in linkA and delete it from array
-    if(linkA === undefined){
-        return true;
-    }
-    linkA = jQuery(linkA);
-    if(linkA.hasClass('ajax-modified-cls') ){
-        // How did we get here? It should not have the interportalcls4ajax class!
-        linkA.removeClass('interportalcls4ajax');
-        return true; // processing or processed this one already.
-    }
-    linkA.removeClass('interportalcls4ajax'); // processing this one.
-    var unique_id = linkA.attr('href');
-
-    var portal_acronym = linkA.attr('portal-cls');
-    var ajax_uri = linkA.attr('data-cls') + jQuery(document).data().bp.config.interportal_hash[portal_acronym].apikey;
-    jQuery.ajax({
-        url: ajax_uri,
-        timeout: ajax_process_timeout * 1000,
-        success: function(data){
-            var label = data.prefLabel
-            if (typeof label !== "undefined" && label.length > 0) {
-                linkA.html(label);
-                linkA.addClass('ajax-modified-cls');
-                // find and process any identical classes (low probability)
-                jQuery( 'a[href="' + unique_id + '"]').each(function(i,e){
-                    var link = jQuery(this);
-                    if(! link.hasClass('ajax-modified-cls') ){
-                        link.removeClass('interportalcls4ajax');   // processing this one.
-                        link.html(label);
-                        link.addClass('ajax-modified-cls'); // processed this one.
-                    }
-                });
-            } else {
-                // remove the unique_id separator and the ontology acronym from the href
-                linkA.addClass('ajax-modified-cls');
-            }
-        },
-        error: function(data){
-            linkA.addClass('ajax-error'); // processed this one.
-        }
-    });
-};
diff --git a/app/assets/javascripts/bp_notes.js b/app/assets/javascripts/bp_notes.js
deleted file mode 100644
index 61f9e8f447..0000000000
--- a/app/assets/javascripts/bp_notes.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function hideOrUnhideArchivedOntNotes() {
-  if (jQuery("#hide_archived_ont:checked").val() !== undefined) {
-    // Checked
-    ontNotesTable.fnFilter('false', ont_columns.archived);
-  } else {
-    // Unchecked
-    ontNotesTable.fnFilter('', ont_columns.archived, true, false);
-  }
-}
-
-function wireOntTable(ontNotesTableNew, showTarget= true, enableDelete = false) {
-  jQuery.data(document.body, "ontology_id", "#{@ontology.acronym}");
-
-
-  let ont_columns = { archived: 3, date: 7, subjectSort: 2 };
-  var ontNotesTable = ontNotesTableNew;
-  let columns =  [
-    { "bVisible": enableDelete }, // Delete
-    { "iDataSort": ont_columns.subjectSort }, // Subject link
-    { "bVisible": false }, // Subject for sort
-    { "bVisible": false }, // Archived for filter
-    null, // Author
-    null, // Type
-    null // Created
-  ]
-
-  if(showTarget){
-    columns.push(null) // Target
-  }else {
-    ont_columns.date--
-  }
-
-  ontNotesTable.dataTable({
-    "iDisplayLength": 50,
-    "sPaginationType": "full_numbers",
-    "aaSorting": [[ont_columns.date, 'desc']],
-    "aoColumns": columns,
-  });
-  // Important! Table is somehow getting set to zero width. Reset here.
-  jQuery(ontNotesTable).css("width", "100%");
-  ontNotesTable.fnFilter('false', ont_columns.archived);
-}
diff --git a/app/assets/javascripts/bp_ontolobridge.js b/app/assets/javascripts/bp_ontolobridge.js
deleted file mode 100644
index d4acc3e977..0000000000
--- a/app/assets/javascripts/bp_ontolobridge.js
+++ /dev/null
@@ -1,359 +0,0 @@
-function bindAddRequestTermClick() {
-  jQuery("a.add_request_term").live('click', function(){
-    var id = jQuery(this).attr("data-parent-id");
-    addRequestTermBox(id);
-  });
-}
-
-function bindCancelRequestTermClick() {
-  jQuery(".request_term_form_div .cancel").live('click', function() {
-    removeRequestTermBox();
-  });
-}
-
-function bindNewTermInstructionsClick() {
-  jQuery("#new_term_instructions").live("click", function() {
-    jQuery(this).trumbowyg({
-      btns: [
-        ['viewHTML'],
-        ['undo', 'redo'], // Only supported in Blink browsers
-        ['formatting'],
-        ['strong', 'em', 'del'],
-        ['superscript', 'subscript'],
-        ['link'],
-        ['insertImage'],
-        ['justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull'],
-        ['unorderedList', 'orderedList'],
-        ['horizontalRule'],
-        ['removeformat'],
-        ['fullscreen']
-      ]
-    });
-    jQuery("#new_term_instructions_submit").show();
-    jQuery("#new_term_instructions_cancel").show();
-  });
-}
-
-function bindNewTermInstructionsSubmit() {
-  jQuery("#new_term_instructions_submit").live("click", function() {
-    saveNewTermInstructions();
-  });
-}
-
-function bindNewTermInstructionsCancel() {
-  jQuery("#new_term_instructions_cancel").live("click", function() {
-    var oldVal = jQuery("#new_term_instructions_old").val().trim();
-    var curVal = jQuery('#new_term_instructions').html().trim();
-
-    if (oldVal != curVal) {
-      if (confirm('Are you sure you want to discard your changes?')) {
-        jQuery('#new_term_instructions').trumbowyg('destroy');
-        jQuery('#new_term_instructions').html(oldVal);
-        hideButtons();
-      }
-    } else {
-      jQuery('#new_term_instructions').trumbowyg('destroy');
-      hideButtons();
-    }
-  });
-}
-
-function preventNewTermInstructionsFormSubmit() {
-  jQuery("#new_term_instructions_form").submit(function(e) {
-    e.preventDefault(e);
-  });
-}
-
-function clearProgressMessage(parentContainerID) {
-  var progMsgElem = jQuery("#" + parentContainerID + " #progress_message");
-  progMsgElem.hide();
-  progMsgElem.html("");
-}
-
-function showProgressMessage(parentContainerID) {
-  clearProgressMessage(parentContainerID);
-  var msg = "Saving...";
-  var progMsgElem = jQuery("#" + parentContainerID + " #progress_message");
-  progMsgElem.text(msg).html();
-  progMsgElem.show();
-}
-
-function saveNewTermInstructions() {
-  var params = jQuery('#new_term_instructions_form').serialize();
-  var newInstructions = jQuery('#new_term_instructions').html().trim();
-  params += '&new_term_instructions=' + newInstructions;
-  var parentContainerID = 'new_term_instructions_container';
-  showProgressMessage(parentContainerID);
-
-  jQuery.ajax({
-    type: "POST",
-    url: "/ontolobridge/save_new_term_instructions",
-    dataType: "json",
-    data: params,
-    success: function(data) {
-      var status = data[1];
-
-      if (status && status >= 400 || data[0]['error'].length) {
-        showStatusMessages('', data[0]['error']);
-      } else {
-        jQuery('#new_term_instructions').trumbowyg('destroy');
-        jQuery("#new_term_instructions_old").val(newInstructions);
-        showStatusMessages(data[0]["success"], '');
-        setTimeout(function() { clearStatusMessages(); }, 5000);
-      }
-    },
-    error: function(request, textStatus, errorThrown) {
-      showStatusMessages('', errorThrown);
-    },
-    complete: function(request, textStatus) {
-      clearProgressMessage(parentContainerID);
-      hideButtons();
-    }
-  });
-}
-
-function hideButtons() {
-  jQuery("#new_term_instructions_submit").hide();
-  jQuery("#new_term_instructions_cancel").hide();
-}
-
-function bindRequestTermSaveClick() {
-  var success = "";
-  var error = "";
-  var user = jQuery(document).data().bp.user;
-  var ontology_id = jQuery(document).data().bp.ont_viewer.ontology_id;
-  var params = jQuery("#request_term_form").serialize();
-  params += "&ontology=" + ontology_id + "&email=" + user["email"]
-
-  if (user["firstName"] && user["lastName"]) {
-    params += "&submitter=" + user["firstName"] + " " + user["lastName"];
-  }
-
-  var parentContainerID = 'proposal_buttons';
-  showProgressMessage(parentContainerID);
-
-  jQuery.ajax({
-    type: "POST",
-    url: "/ontolobridge",
-    data: params,
-    dataType: "json",
-    success: function(data) {
-      var status = data[1];
-
-      if (status && status >= 400) {
-        showStatusMessages('', data[0]["error"]);
-      } else {
-        var msg = "<strong>A new term request has been submitted successfully:</strong><br/><br/>";
-        removeRequestTermBox();
-
-        for (var i in data[0]) {
-          msg += i + ": " + data[0][i] + "<br/>";
-        }
-        showStatusMessages(msg, error);
-      }
-    },
-    error: function(request, textStatus, errorThrown) {
-      error = "The following error has occurred: " + errorThrown + ". Please try again.";
-      showStatusMessages(success, error);
-    },
-    complete: function(request, textStatus) {
-      clearProgressMessage(parentContainerID);
-    }
-  });
-}
-
-function removeRequestTermBox() {
-  jQuery(".request_term_form_div").html("");
-}
-
-function addRequestTermBox(id) {
-  clearStatusMessages();
-  var formContainer = jQuery(".request_term_form_div");
-  var requestTermForm = requestTermFields(id, formContainer);
-  var formID = requestTermForm.attr('id');
-  var isPopulated = window.localStorage.getItem(formID + '_populated');
-
-  if (isPopulated) {
-    for (var key in window.localStorage) {
-      if (key.startsWith(formID)) {
-        var elemID = key.replace(formID + '_', '');
-        var elem = jQuery('#' + formID + ' #' + elemID);
-
-        if (elem.attr('type') === "checkbox") {
-          elem.prop("checked", true);
-        } else if (elem.length > 0) {
-          var val = window.localStorage.getItem(key);
-          elem.val(val);
-        }
-        window.localStorage.removeItem(key);
-      }
-    }
-  }
-  formContainer.show();
-  jQuery("#label").focus();
-}
-
-function clearStatusMessages() {
-  jQuery("#ob_success_message").hide();
-  jQuery("#ob_error_message").hide();
-  jQuery("#ob_success_message").html("");
-  jQuery("#ob_error_message").html("");
-}
-
-function showStatusMessages(success, error) {
-  if (success.length > 0) {
-      let ob = jQuery("#ob_success_message")
-      console.log('show ob message')
-      console.log(ob)
-      ob.html(success);
-      ob.show();
-  }
-
-  if (error.length > 0) {
-    jQuery("#ob_error_message").text(error).html();
-    jQuery("#ob_error_message").show();
-  }
-}
-
-function requestTermButtons() {
-  var buttonSubmit = jQuery("<button>")
-    .attr("class", "btn")
-    .attr("type", "submit")
-    .attr("onclick", "")
-    .addClass("save")
-    .css("margin-right", "5px")
-    .html("Submit");
-  var buttonCancel = jQuery("<button>")
-    .attr("class", "btn")
-    .attr("type", "button")
-    .attr("onclick", "")
-    .addClass("cancel")
-    .html("Cancel");
-  var progressMessage = jQuery("<span>")
-    .attr("id", "progress_message")
-    .css("display", "none")
-    .css("margin-left", "20px");
-  return buttonSubmit.add(buttonCancel).add(progressMessage);
-}
-
-function appendTextArea(id, placeholder, div, isRequired, invalidMessage) {
-  if (jQuery.browser.msie && parseInt(jQuery.browser.version) < 10) {
-    div.append(jQuery("<span>").css("font-weight", "bold").html(text));
-    div.append("<br/>");
-  }
-
-  var txtArea = jQuery("<textarea>", {
-    rows: 1,
-    cols: 1,
-    id: id,
-    name: id,
-    placeholder: placeholder,
-    css: {"width": "500px", "height": "100px", "margin": "5px 0 5px 0"}
-  });
-
-  jQuery(txtArea).on("invalid", function(e) {
-    this.setCustomValidity(invalidMessage);
-  });
-
-  jQuery(txtArea).on("input", function(e) {
-    this.setCustomValidity('');
-  });
-
-  if (isRequired) {
-    txtArea.prop('required', true);
-    txtArea.attr("class", "req");
-  }
-  div.append(txtArea);
-  div.append("<br/>");
-}
-
-function appendField(id, text, div, isRequired, invalidMessage) {
-  if (jQuery.browser.msie && parseInt(jQuery.browser.version) < 10) {
-    div.append(jQuery("<span>").css("font-weight", "bold").html(text));
-    div.append("<br/>");
-  }
-
-  var ipt = jQuery("<input>", {
-    type: 'text',
-    id: id,
-    name: id,
-    placeholder: text,
-    css: {"width": "500px", "margin": "5px 0 5px 0"}
-  });
-
-  jQuery(ipt).on("invalid", function(e) {
-    this.setCustomValidity(invalidMessage);
-  });
-
-  jQuery(ipt).on("input", function(e) {
-    this.setCustomValidity('');
-  });
-
-  if (isRequired) {
-    ipt.prop('required', true);
-    ipt.attr("class", "req");
-  }
-  div.append(ipt);
-  div.append("<br/>");
-}
-
-function requestTermFields(id, container) {
-  container.html("");
-  var requestTermForm = jQuery("<form/>", {id: 'request_term_form', name: 'request_term_form'});
-
-  appendField("label", "Enter term label (required)", requestTermForm, true, 'Please enter a label for a new term');
-  appendTextArea("description", "Enter term description (required)", requestTermForm, true, 'Please enter a description for a new term');
-
-  requestTermForm.append(jQuery("<span>").css("font-weight", "bold").css("margin", "5px 0 5px 0").html("Superclass: "));
-  requestTermForm.append(g_prefLabel + "<br/>");
-
-  appendField("references", "Enter references - links that provide more info on the term", requestTermForm, false, 'Please enter references for a new term. References are any links (either URIs or URLs) that provide more information about the term.');
-  appendTextArea("justification", "Enter justification for the term - the reason it should be added", requestTermForm, false, 'Please enter a justification. Justifications are notes provided by the submitter to justify the term; often this will not be necessary, since for most routine cases the label/description/position will be sufficient, but sometimes it may be necessary to justify why a new term is necessary.');
-
-  requestTermForm.append(jQuery("<input>").attr("type", "checkbox").attr("name", "notification_request").attr("id", "notification_request").css("height", "15px")).append("&nbsp;&nbsp;");
-  requestTermForm.append(jQuery("<input>").attr("type", "hidden").attr("name", "superclass").attr("id", "superclass").attr("value", id));
-  requestTermForm.append(jQuery("<label>").attr("for", "notification_request").attr("id", "notification_request").css("margin", "0 0 10px 0").append("Email submitter when there is a status change"));
-  requestTermForm.append(jQuery("<div>").attr("id", "proposal_buttons").append(requestTermButtons()));
-  container.append(requestTermForm);
-
-  requestTermForm.submit(function(e) {
-    e.preventDefault(e);
-    bindRequestTermSaveClick();
-    return false;
-  });
-
-  return requestTermForm;
-}
-
-function obTriggerNewTermRequestFormSave() {
-  var ont = jQuery(document).data().bp.ontology;
-  var ob_onts = jQuery(document).data().bp.ontolobridge_ontologies;
-
-  // Execute only if ontology is Ontolobridge-enabled
-  if (Object.entries(ont).length > 0 && ob_onts && ob_onts.length > 0 && ob_onts.includes(ont["acronym"])) {
-    var formName = 'request_term_form';
-
-    jQuery("#" + formName + " input, #" + formName + " textarea").each(function() {
-      var input = jQuery(this);
-      var val = input.val().trim();
-
-      if (input.attr('type') === "checkbox" && input.prop('checked') === true) {
-        window.localStorage.setItem(formName + '_' + input.attr('name'), 'checkbox_checked');
-        window.localStorage.setItem(formName + '_populated', true);
-      } else if (input.attr('type') !== "hidden" && input.attr('type') !== "checkbox" && val) {
-        window.localStorage.setItem(formName + '_' + input.attr('name'), val);
-        window.localStorage.setItem(formName + '_populated', true);
-      }
-    });
-  }
-}
-
-jQuery(document).ready(function() {
-  clearStatusMessages();
-  bindAddRequestTermClick();
-  bindCancelRequestTermClick();
-  preventNewTermInstructionsFormSubmit();
-  bindNewTermInstructionsSubmit();
-  bindNewTermInstructionsCancel();
-  bindNewTermInstructionsClick();
-});
diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
index 59a73166f2..2b521539f4 100755
--- a/app/assets/stylesheets/application.css.scss.erb
+++ b/app/assets/stylesheets/application.css.scss.erb
@@ -32,7 +32,6 @@
 @import "recommender";
 @import "search";
 @import "submissions";
-@import "ontolobridge";
 @import "fair_assement";
 @import "instances_table";
 @import "register";
diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index a55292bde0..57e857442c 100644
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -266,6 +266,9 @@
   z-index: 1;
 
 }
+.browse-filter .switch-filter > p, .switch-filter > div{
+  max-width: 207px;
+}
 
 .browse-search-bar input:focus {
   box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss
index 9965d2bfd5..875138bdd7 100644
--- a/app/assets/stylesheets/home.scss
+++ b/app/assets/stylesheets/home.scss
@@ -222,7 +222,7 @@ i.fa.fa-caret-square-o-down {
 .home-statistics-container > div {
   display: flex;
   align-items: start;
-  justify-content: center;
+  justify-content: flex-start;
   flex-wrap: wrap;
 }
 .home-agroportal-figures{
diff --git a/app/assets/stylesheets/mappings.scss b/app/assets/stylesheets/mappings.scss
index 89a7ebffbe..20ddbb6940 100644
--- a/app/assets/stylesheets/mappings.scss
+++ b/app/assets/stylesheets/mappings.scss
@@ -320,6 +320,28 @@ div#map_from_concept_details_table, div#map_to_concept_details_table {
 
 #concept_mappings_table {
   width: 100%;
+  word-break: break-word;
+  font-size: 13px;
+}
+.mappings-table-mapping-to{
+  width: 45%;
+}
+.mappings-table-mapping-to .chip-button-component-container{
+  text-wrap: wrap !important;
+}
+.mappings-table-mapping-to a{
+  background-color: unset;
+  line-height: unset;
+  padding: unset;
+  font-weight: unset;
+  font-size: unset;
+}
+.mappings-table-icon{
+  width: 18px;
+  height: 18px;
+}
+.mappings-table-icon path{
+  fill: var(--gray-color);
 }
 
 .summary-mappings-tab-table {
@@ -341,4 +363,7 @@ div#map_from_concept_details_table, div#map_to_concept_details_table {
   padding: 10px;
   outline: none;
   margin-left: 0 !important;
+}
+.mappings-table-actions svg path{
+  fill: var(--primary-color);
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/ontolobridge.scss b/app/assets/stylesheets/ontolobridge.scss
deleted file mode 100644
index ebcc8e9426..0000000000
--- a/app/assets/stylesheets/ontolobridge.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-/* message boxes */
-.message-box {
-  color: #555;
-  border-radius: 3px;
-  font-family: Tahoma, Geneva, Arial, sans-serif;
-  font-size: 11px;
-  padding: 10px;
-  margin: 10px 0 0 0;
-}
-
-.message-box span {
-  font-weight: bold;
-  text-transform: uppercase;
-}
-
-.error-msg {
-  //background-color: #eee;
-  border: 1px solid #f5aca6;
-}
-
-.success-msg {
-  //background-color: #eee;
-  border: 1px solid #a6ca8a;
-}
-
-input.req,
-textarea.req {
-  border-color: darksalmon !important;
-}
-
-blockquote {
-  padding: 0 1em;
-  color: #6a737d;
-  border-left: .25em solid #dfe2e5;
-}
diff --git a/app/assets/stylesheets/ontologies.scss b/app/assets/stylesheets/ontologies.scss
index ccaf70d314..3b71432d37 100644
--- a/app/assets/stylesheets/ontologies.scss
+++ b/app/assets/stylesheets/ontologies.scss
@@ -2,6 +2,7 @@ $ont-metadata-bg-color: #e2ebf0;
 $widget-table-border-color: #EFEFEF;
 
 
+
 .admin-background{
   a.chip_button_container_clickable{
     color: var(--admin-color) !important;
@@ -314,4 +315,4 @@ $widget-table-border-color: #EFEFEF;
   color: white;
   border-radius: 10px;
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/taxonomy.scss b/app/assets/stylesheets/taxonomy.scss
index 6043973aa8..bf5c679ff5 100644
--- a/app/assets/stylesheets/taxonomy.scss
+++ b/app/assets/stylesheets/taxonomy.scss
@@ -63,7 +63,18 @@
 }
 .taxonomy-card .description{
     color: #666666;
-    padding-bottom: 5px;
+}
+
+.taxonomy-card .descriptionlink svg{
+    margin: 0px 2px;
+    height: 19px;
+}
+
+.taxonomy-card .descriptionlink svg path{
+    fill: #666666;
+}
+.category-link{
+    color: #666666 !important;
 }
 .taxonomy-slice-svg{
     width: 35px;
diff --git a/app/components/chip_button_component/chip_button_component.html.haml b/app/components/chip_button_component/chip_button_component.html.haml
index 26172a5487..f2dd0d3dd0 100644
--- a/app/components/chip_button_component/chip_button_component.html.haml
+++ b/app/components/chip_button_component/chip_button_component.html.haml
@@ -4,7 +4,7 @@
       = @text || content
   - elsif !content
     %a.chip_button_container_clickable{@html_options}
-      = @text
+      = @text.html_safe
   - else
     %span.chip_button_container_clickable{@html_options}
       = content
diff --git a/app/components/display/taxonomy_card_component.rb b/app/components/display/taxonomy_card_component.rb
index df896191b6..89b05bcb69 100644
--- a/app/components/display/taxonomy_card_component.rb
+++ b/app/components/display/taxonomy_card_component.rb
@@ -1,4 +1,5 @@
 class Display::TaxonomyCardComponent < ViewComponent::Base
+  include UrlsHelper
   def initialize(taxonomy: , ontologies_names: )
     @taxonomy = taxonomy
     @ontologies_names = ontologies_names
diff --git a/app/components/display/taxonomy_card_component/taxonomy_card_component.html.haml b/app/components/display/taxonomy_card_component/taxonomy_card_component.html.haml
index ab55aa41de..218eaca749 100644
--- a/app/components/display/taxonomy_card_component/taxonomy_card_component.html.haml
+++ b/app/components/display/taxonomy_card_component/taxonomy_card_component.html.haml
@@ -4,12 +4,22 @@
       = "#{@taxonomy.name} (#{@taxonomy.acronym})"
     %a{href: "https://#{@taxonomy.acronym}.#{$UI_URL.sub("https://", "")}"}
       = inline_svg_tag('icons/slices.svg', class: "taxonomy-slice-svg #{@taxonomy.is_slice ? '' : 'd-none'}")
+  
+  - if link?(@taxonomy.description)
+    .descriptionlink
+      %a.category-link{href: @taxonomy.description, target: '_blank'}
+        = @taxonomy.description
+        = inline_svg_tag 'icons/external-link.svg'
+  
   %a.ontologies{href: "/ontologies?#{@taxonomy.id.split('/')[-2]}=#{@taxonomy.acronym}"}
     = inline_svg_tag('icons/ontology.svg')
     .number-of-ontologies
       = "#{@taxonomy.ontologies.length} ontologies"
-  .description
-    = render TextAreaFieldComponent.new(value: @taxonomy.description)
+
+  - unless link?(@taxonomy.description)
+    .description.mb-1
+      = render TextAreaFieldComponent.new(value: @taxonomy.description)
+
   .ontologies-cards
     - @taxonomy.ontologies.each_with_index do |ontology, index|
       - if index>10
diff --git a/app/components/label_fetcher_component.rb b/app/components/label_fetcher_component.rb
new file mode 100644
index 0000000000..f89f39d16e
--- /dev/null
+++ b/app/components/label_fetcher_component.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+class LabelFetcherComponent < ViewComponent::Base
+  include UrlsHelper, Turbo::FramesHelper, ModalHelper
+
+  def initialize(id:, label: nil, link: nil, ajax_src: nil, open_in_modal: false, target: nil, external: false)
+    super
+    @id = id
+    @link = link
+    @ajax_src = ajax_src
+    @open_in_modal = open_in_modal
+    @target = target
+    @external = external
+    @label = label
+
+    if external_link?
+      @link = id
+      @target ||= '_blank'
+    else
+      @target ||= '_top'
+    end
+
+  end
+
+  def external_link?
+    (@label.nil? || @label.eql?(@id)) && @external
+  end
+
+  def label_fetcher_container(&block)
+    id = "#{escape(@id)}_label"
+    if @ajax_src
+      render(TurboFrameComponent.new(id: id, src: "#{@ajax_src}&target=#{@target}", loading: 'lazy')) do |t|
+        t.loader do
+          render ChipButtonComponent.new(url: @id, text: "#{@id} #{render(LoaderComponent.new(small: true))}", type: 'clickable', target: '_blank')
+        end
+
+        t.error do
+          capture(&block)
+        end
+      end
+    else
+      turbo_frame_tag(id) do
+        capture(&block)
+      end
+    end
+
+  end
+
+  def link_with_icon
+    if external_link?
+      ExternalLinkTextComponent.new(text: @label).call
+    else
+      InternalLinkTextComponent.new(text: @label).call
+    end
+  end
+end
diff --git a/app/components/label_fetcher_component/label_fetcher_component.html.haml b/app/components/label_fetcher_component/label_fetcher_component.html.haml
new file mode 100644
index 0000000000..80587133d1
--- /dev/null
+++ b/app/components/label_fetcher_component/label_fetcher_component.html.haml
@@ -0,0 +1,10 @@
+= label_fetcher_container do
+  - if @open_in_modal
+    = render ChipButtonComponent.new(type: 'clickable') do
+      = link_to_modal(@label, @link)
+  - else
+    %span
+      = render ChipButtonComponent.new(url: @link,
+                                         type: 'clickable',
+                                         text: link_with_icon,
+                                         target: @target)
diff --git a/app/components/label_link_component.rb b/app/components/label_link_component.rb
deleted file mode 100644
index 3d8ecee988..0000000000
--- a/app/components/label_link_component.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class LabelLinkComponent < ViewComponent::Base
-
-  def initialize(id:, text:, icon: 'popup-link')
-    @id = id
-    @text = text
-    @icon = icon
-  end
-
-  def call
-    if @id.eql?(@text)
-      ExternalLinkTextComponent.new(text: @text).call
-    else
-      InternalLinkTextComponent.new(text: @text).call
-    end
-  end
-
-  def self.inline(id, text)
-    { plain: LabelLinkComponent.new(id: id, text: text).call }
-  end
-end
diff --git a/app/components/link_text_component.rb b/app/components/link_text_component.rb
index 47ea0f6dfc..36dc79ba33 100644
--- a/app/components/link_text_component.rb
+++ b/app/components/link_text_component.rb
@@ -10,7 +10,7 @@ def initialize(text:, icon: nil, target: nil)
   end
 
   def call
-    svg_icon = !@icon&.empty? ? inline_svg(@icon) : ''
+    svg_icon = !@icon&.empty? ? inline_svg(@icon, width: '14px', height: '14px') : ''
     extra_span = @text == t('mappings.upload_mappings') ? '' : "<span class='mx-1'>#{svg_icon}</span>"
     "#{@text}#{extra_span}".html_safe
   end
diff --git a/app/components/tree_link_component.rb b/app/components/tree_link_component.rb
index 73da902f20..fd23706d96 100644
--- a/app/components/tree_link_component.rb
+++ b/app/components/tree_link_component.rb
@@ -2,26 +2,19 @@
 
 class TreeLinkComponent < ViewComponent::Base
   include MultiLanguagesHelper, ModalHelper, ApplicationHelper
-  def initialize(child:, href:, children_href: , selected: false , data: {}, muted: false, target_frame: nil, open_in_modal: false, is_reused: nil)
+
+  def initialize(child:, href:, children_href:, selected: false, data: {}, muted: false, target_frame: nil, open_in_modal: false, is_reused: nil)
+    super
+
     @child = child
     @active_style = selected ? 'active' : ''
-    #@icons = child.relation_icon(node)
     @muted_style = muted ? 'text-muted' : ''
     @href = href
     @children_link = children_href
-    label = (@child.prefLabel || @child.label) rescue @child.id
-    if label.nil?
-      @pref_label_html = link_last_part(child.id)
-    else
-      pref_label_lang, @pref_label_html = select_language_label(label)
-      pref_label_lang = pref_label_lang.to_s.upcase
-      @tooltip = pref_label_lang.eql?("@NONE") ? "" : pref_label_lang
 
-      if child.obsolete?
-        @pref_label_html = "<span class='obsolete_class'>#{@pref_label_html}</span>".html_safe
-      end
-    end
-    @data ||= { controller: 'tooltip', 'tooltip-position-value': 'right', turbo: true, 'turbo-frame': target_frame, action: 'click->simple-tree#select'}
+    @pref_label_html, @tooltip = node_label(child)
+
+    @data ||= { controller: 'tooltip', 'tooltip-position-value': 'right', turbo: true, 'turbo-frame': target_frame, action: 'click->simple-tree#select' }
 
     @data.merge!(data) do |_, old, new|
       "#{old} #{new}"
@@ -32,7 +25,6 @@ def initialize(child:, href:, children_href: , selected: false , data: {}, muted
     @is_reused = is_reused
   end
 
-
   # This gives a very hacky short code to use to uniquely represent a class
   # based on its parent in a tree. Used for unique ids in HTML for the tree view
   def short_uuid
@@ -49,7 +41,7 @@ def open?
   end
 
   def border_left
-    !@child.hasChildren  ?  'pl-3 tree-border-left' :  ''
+    !@child.hasChildren ? 'pl-3 tree-border-left' : ''
   end
 
   def li_id
@@ -75,4 +67,26 @@ def open_children_link
 
   end
 
+  private
+
+  def node_label(child)
+    label = begin
+              child.prefLabel || child.label
+            rescue
+              child.id
+            end
+
+    if label.nil?
+      pref_label_html = link_last_part(child.id)
+    else
+      pref_label_lang, pref_label_html = select_language_label(label)
+      pref_label_lang = pref_label_lang.to_s.upcase
+      tooltip = pref_label_lang.eql?("@NONE") ? "" : pref_label_lang
+
+      pref_label_html = "<span class='obsolete_class'>#{pref_label_html}</span>".html_safe if child.obsolete?
+    end
+
+    [pref_label_html, tooltip]
+  end
+
 end
diff --git a/app/components/turbo_frame_component.rb b/app/components/turbo_frame_component.rb
index d25322e154..1e54e24ce8 100644
--- a/app/components/turbo_frame_component.rb
+++ b/app/components/turbo_frame_component.rb
@@ -4,6 +4,7 @@ class TurboFrameComponent < ViewComponent::Base
   include Turbo::FramesHelper
 
   renders_one :loader
+  renders_one :error
 
   def initialize(id:, src: '', **html_options)
     @id = id
diff --git a/app/components/turbo_frame_component/turbo_frame_component.html.haml b/app/components/turbo_frame_component/turbo_frame_component.html.haml
index 1c5d0d9f59..a288d8eaca 100644
--- a/app/components/turbo_frame_component/turbo_frame_component.html.haml
+++ b/app/components/turbo_frame_component/turbo_frame_component.html.haml
@@ -8,5 +8,9 @@
     - else
       %div.p-3
         = render LoaderComponent.new(type: 'pulsing')
-  %div{'data-turbo-frame-error-target': 'errorMessage', style:'display: none; width: 100%'}
-    = render Display::AlertComponent.new(type:'danger')
\ No newline at end of file
+  %span{'data-turbo-frame-error-target': 'errorMessage', style:'display: none; width: 100%'}
+    - if error?
+      = error
+    - else
+      %div
+        = render Display::AlertComponent.new(type:'danger')
diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb
index c058eb130f..5c06c79a39 100644
--- a/app/controllers/agents_controller.rb
+++ b/app/controllers/agents_controller.rb
@@ -18,7 +18,7 @@ def show
   end
 
   def ajax_agents
-    filters = { query: params[:query], qf: "identifiers_texts^20 acronym_text^15 name_text^10 email_text^10"}
+    filters = { query: "#{params[:query]}*", qf: "identifiers_texts^20 acronym_text^15 name_text^10 email_text^10"}
     @agents = LinkedData::Client::HTTP.get('/search/agents', filters)
     agents_json = @agents.collection.map do |x|
       {
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7af57ee341..1a8a3c8278 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -13,7 +13,7 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  include InternationalisationHelper
+  include InternationalisationHelper, MultiLanguagesHelper
 
   before_action :set_locale
 
@@ -26,6 +26,9 @@ def set_locale
     I18n.locale = cookies[:locale] || detect_locale
     cookies.permanent[:locale] = I18n.locale if cookies[:locale].nil?
     logger.debug "* Locale set to '#{I18n.locale}'"
+
+    I18n.locale = portal_lang if portal_language_enabled?(I18n.locale)
+
     session[:locale] = I18n.locale
   end
 
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index c01c0cf879..699eda2698 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -1,7 +1,6 @@
 class CollectionsController < ApplicationController
   include CollectionsHelper,SearchContent
 
-
   def index
     acronym = params[:ontology]
     @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(acronym).first
@@ -47,21 +46,30 @@ def show
 
   def show_label
     collection_label = ''
-    collection  = get_request_collection
-    collection_label =  collection['prefLabel'] if collection
-    collection_label = params[:id]  if collection_label.nil? || collection_label.empty?
+    collection = get_request_collection
+    collection_label = collection['prefLabel'] if collection
+    collection_label = params[:id] if collection_label.nil? || collection_label.empty?
 
-    render LabelLinkComponent.inline(params[:id], helpers.main_language_label(collection_label))
+    label = helpers.main_language_label(collection_label)
+    link = collection_path(collection_id: params[:id], ontology_id: params[:ontology_id], language: request_lang)
+    render(inline: helpers.ajax_link_chip(params[:id], label, link, external: collection.blank?), layout: false)
   end
 
   def show_members
     @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id] || params[:ontology]).first
-    @submission = @ontology.explore.latest_submission(include:'uriRegexPattern,preferredNamespaceUri')
-    @collection = get_request_collection
+    @submission = @ontology.explore.latest_submission(include: 'uriRegexPattern,preferredNamespaceUri')
     page = params[:page] || '1'
     @auto_click = page.to_s.eql?('1')
-    @page = @collection.explore.members({page: page, language: request_lang})
-    @concepts = @page.collection
+    @collection = get_request_collection(@ontology)
+
+    if @collection
+      @page = @collection.explore.members({ page: page, language: request_lang })
+      @concepts = @page.collection
+    else
+      @page = OpenStruct.new({ nextPage: 1, page: 1 })
+      @concepts = []
+    end
+
     if @ontology.nil?
       ontology_not_found params[:ontology]
     else
@@ -71,14 +79,12 @@ def show_members
 
   private
 
-  def get_request_collection
+  def get_request_collection(ontology = nil)
     params[:id] = request_collection_id
 
-    if params[:id].nil? || params[:id].empty?
-      render plain: t('collections.error_valid_collection')
-      return
-    end
-    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id] || params[:ontology]).first
+    return nil if params[:id].nil? || params[:id].empty?
+
+    @ontology = ontology || LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id] || params[:ontology]).first
     ontology_not_found(params[:ontology_id]) if @ontology.nil?
     get_collection(@ontology, params[:id])
   end
diff --git a/app/controllers/concepts_controller.rb b/app/controllers/concepts_controller.rb
index 196a61f97d..3d4923296f 100644
--- a/app/controllers/concepts_controller.rb
+++ b/app/controllers/concepts_controller.rb
@@ -23,7 +23,6 @@ def show
     redirect_to(ontology_path(id: params[:ontology], p: 'classes', conceptid: params[:id], lang: request_lang)) and return unless turbo_frame_request?
 
     @submission = get_ontology_submission_ready(@ontology)
-    @ob_instructions = helpers.ontolobridge_instructions_template(@ontology)
     @concept = @ontology.explore.single_class({full: true, language: request_lang}, params[:id])
     @instances_concept_id = @concept.id
 
@@ -43,16 +42,16 @@ def index
 
     # Note that find_by_acronym includes views by default
     @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology]).first
-    @ob_instructions = helpers.ontolobridge_instructions_template(@ontology)
 
-    @submission = @ontology.explore.latest_submission(include: 'all')
+    @submission = @ontology.explore.latest_submission(include:'uriRegexPattern,preferredNamespaceUri')
+
+    @concept = @ontology.explore.single_class({dispay: 'prefLabel'}, params[:id])
 
-    @concept = @ontology.explore.single_class({full: true}, params[:id])
     concept_not_found(params[:id]) if @concept.nil?
     @schemes = params[:concept_schemes].split(',')
 
     @concept.children = @concept.explore.children(pagesize: 750, concept_schemes: Array(@schemes).join(','), language: request_lang, display: 'prefLabel,obsolete,hasChildren').collection || []
-    @concept.children.sort! { |x, y| (x.prefLabel || "").downcase <=> (y.prefLabel || "").downcase } unless @concept.children.empty?
+
     render turbo_stream: [
       replace(helpers.child_id(@concept) + '_open_link') { TreeLinkComponent.tree_close_icon },
       replace(helpers.child_id(@concept) + '_childs') do
@@ -62,10 +61,18 @@ def index
   end
 
   def show_label
-    cls_id = params[:concept] || params[:id]  # cls_id should be a full URI
-    ont_id = params[:ontology]  # ont_id could be a full URI or an acronym
-
-    render LabelLinkComponent.inline(cls_id, helpers.main_language_label(concept_label(ont_id, cls_id)))
+    cls_id = params[:concept] || params[:id]
+    ont_id = params[:ontology]
+    pref_label = begin
+                   concept_label(ont_id, cls_id)
+                 rescue
+                   cls_id
+                 end
+    cls = @ontology.explore&.single_class({ language: request_lang, include: 'prefLabel' }, cls_id)
+    label = helpers.main_language_label(pref_label)
+    link = concept_path(cls_id, ont_id, request_lang)
+
+    render(inline: helpers.ajax_link_chip(cls_id, label, link, external: cls.nil? || cls.errors), layout: nil)
   end
 
   def show_definition
@@ -86,8 +93,8 @@ def show_tree
       not_found(t('concepts.missing_roots')) if @root.nil?
 
       render inline: helpers.concepts_tree_component(@root, @concept,
-                                      @ontology.acronym, Array(params[:concept_schemes]&.split(',')), request_lang,
-                                      id: 'concepts_tree_view', auto_click: params[:auto_click] || true)
+                                                     @ontology.acronym, Array(params[:concept_schemes]&.split(',')), request_lang,
+                                                     id: 'concepts_tree_view', auto_click: params[:auto_click] || true)
     end
   end
 
diff --git a/app/controllers/concerns/search_aggregator.rb b/app/controllers/concerns/search_aggregator.rb
index 078c89c5c9..f1f074272f 100644
--- a/app/controllers/concerns/search_aggregator.rb
+++ b/app/controllers/concerns/search_aggregator.rb
@@ -251,17 +251,15 @@ def blacklist_cls_id_components(cls_id, blacklist_words)
   def merge_federated_results(search_results)
     search_results.each do |element|
       element[:root][:other_portals] = []
+
       element[:reuses].reject! do |reuse|
-        if (element[:root][:ontology_acronym] == reuse[:root][:ontology_acronym]) && (element[:root][:uri] == reuse[:root][:uri])
-          portal_name = reuse[:root][:portal_name]
-          link = reuse[:root][:link]
-          element[:root][:other_portals] << {
-            name: portal_name,
-            color: federated_portal_color(portal_name),
-            light_color: federated_portal_light_color(portal_name),
-            link: link,
-            ontology_id: reuse[:root][:ontology_id]
-          }
+        element_ontology_id = element[:root][:ontology_id].split('/').last
+        element_uri = element[:root][:uri]
+        reuse_ontology_id = reuse[:root][:ontology_id].split('/').last
+        reuse_uri = reuse[:root][:uri]
+
+        if element_ontology_id == reuse_ontology_id && element_uri == reuse_uri
+          element[:root][:other_portals] << build_other_portal_entry(reuse)
           true
         else
           false
@@ -270,6 +268,16 @@ def merge_federated_results(search_results)
     end
   end
 
+  def build_other_portal_entry(reuse)
+    {
+      name: reuse[:root][:portal_name],
+      color: federated_portal_color(reuse[:root][:portal_name]),
+      light_color: federated_portal_light_color(reuse[:root][:portal_name]),
+      link: reuse[:root][:link],
+      ontology_id: reuse[:root][:ontology_id]
+    }
+  end
+
   def swap_canonical_portal_results_first(search_results)
     all_submissions = LinkedData::Client::Models::OntologySubmission.all(include: 'pullLocation', include_views: true, display_links: false, display_context: false)
 
diff --git a/app/controllers/concerns/submission_filter.rb b/app/controllers/concerns/submission_filter.rb
index c039147280..5bb9937e1a 100644
--- a/app/controllers/concerns/submission_filter.rb
+++ b/app/controllers/concerns/submission_filter.rb
@@ -72,6 +72,7 @@ def merge_by_acronym(submissions)
     submissions.group_by { |x| x[:ontology]&.acronym }.each do |acronym, ontologies|
       ontology = canonical_ontology(ontologies)
       ontology[:sources] = ontologies.map { |x| x[:id] }
+      ontology[:sources].reject! { |id| id.include?(portal_name.downcase) } if ontology[:sources].size.eql?(1)
       merged_submissions << ontology
     end
     merged_submissions
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 2d20328b74..068d217b85 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -23,11 +23,20 @@ def index
 
     @anal_ont_names = []
     @anal_ont_numbers = []
-    @analytics.sort_by{|ont, count| -count}[0..4].each do |ont, count|
-      @anal_ont_names << ont
-      @anal_ont_numbers << count
+    if @analytics.empty?
+      all_metrics = LinkedData::Client::Models::Metrics.all
+      all_metrics.sort_by{|x| -(x.classes + x.individuals)}[0..4].each do |x|
+        @anal_ont_names << x.id.split('/')[-4]
+        @anal_ont_numbers << (x.classes + x.individuals) || 0
+      end
+    else
+      @analytics.sort_by{|ont, count| -count}[0..4].each do |ont, count|
+        @anal_ont_names << ont
+        @anal_ont_numbers << count
+      end
     end
 
+
   end
 
   def set_cookies
diff --git a/app/controllers/label_xl_controller.rb b/app/controllers/label_xl_controller.rb
index 521d35fb7a..e62a749084 100644
--- a/app/controllers/label_xl_controller.rb
+++ b/app/controllers/label_xl_controller.rb
@@ -1,5 +1,5 @@
 class LabelXlController < ApplicationController
-  include LabelXlHelper
+  include LabelXlHelper, UrlsHelper
 
   def show
     @label_xl = get_request_label_xl
@@ -9,8 +9,9 @@ def show_label
     label_xl = get_request_label_xl
     label_xl_label = label_xl ? label_xl['literalForm'] : nil
     label_xl_label = params[:id] if label_xl_label.nil? || label_xl_label.empty?
-
-    render LabelLinkComponent.inline(params[:id], helpers.main_language_label(label_xl_label))
+    label = helpers.main_language_label(label_xl_label)
+    link = "/ajax/label_xl/?id=#{escape(params[:id])}&ontology=#{params[:ontology_id]}&cls_id=#{escape(params[:cls_id])}"
+    render(inline: helpers.ajax_link_chip(params[:id], label, link, open_in_modal: true, external: label_xl.blank?), layout: false)
   end
 
   private
diff --git a/app/controllers/language_controller.rb b/app/controllers/language_controller.rb
index 0ccf6b59c5..56c647489a 100644
--- a/app/controllers/language_controller.rb
+++ b/app/controllers/language_controller.rb
@@ -1,11 +1,12 @@
 class LanguageController < ApplicationController
 
+    include MultiLanguagesHelper
     # set locale to the language selected by the user
     def set_locale_language
         language = params[:language].strip.downcase.to_sym
         supported_languages = I18n.available_locales
-
-        if language
+        
+        if language && portal_language_enabled?(language)
             if supported_languages.include?(language)
                  cookies.permanent[:locale] = language
             else
diff --git a/app/controllers/mappings_controller.rb b/app/controllers/mappings_controller.rb
index b1bcfc8c32..0ca5fd8b77 100644
--- a/app/controllers/mappings_controller.rb
+++ b/app/controllers/mappings_controller.rb
@@ -118,7 +118,7 @@ def show_mappings
       ontology_acronym = @ontology.acronym
       @ontology_name = ontology_acronym
     end
-    if @target_ontology.nil?
+    if @target_ontology.nil? || @target_ontology.errors
       if params[:target] == EXTERNAL_MAPPINGS_GRAPH
         target_acronym = EXTERNAL_URL_PARAM_STR
         @target_ontology_name = t('mappings.external_mappings')
@@ -132,7 +132,6 @@ def show_mappings
     end
 
     ontologies = [ontology_acronym, target_acronym]
-
     @mapping_pages = LinkedData::Client::HTTP.get("#{MAPPINGS_URL}", { page: page, ontologies: ontologies.join(',') })
     not_found(@mapping_pages.errors) if @mapping_pages.respond_to?(:errors)
     @mappings = @mapping_pages.collection
@@ -342,4 +341,56 @@ def valid_values?(values)
     end
     errors
   end
-end
\ No newline at end of file
+
+  def set_mapping_target(concept_to_id:, ontology_to:, mapping_type: )
+    case mapping_type
+    when 'interportal'
+      @map_to_interportal, @map_to_interportal_ontology = ontology_to.match(%r{(.*)/ontologies/(.*)}).to_a[1..]
+      @map_to_interportal_class = concept_to_id
+    when 'external'
+      @map_to_external_ontology = ontology_to
+      @map_to_external_class = concept_to_id
+    else
+      @map_to_bioportal_ontology_id = ontology_to
+      @map_to_bioportal_full_id = concept_to_id
+    end
+  end
+
+  def get_mappings_target_params
+    mapping_type = Array(params[:mapping_type]).first
+    external = true
+    case mapping_type
+    when 'interportal'
+      ontology_to = "#{params[:map_to_interportal]}/ontologies/#{params[:map_to_interportal_ontology]}"
+      concept_to_id = params[:map_to_interportal_class]
+    when 'external'
+      ontology_to = params[:map_to_external_ontology]
+      concept_to_id = params[:map_to_external_class]
+    else
+      ontology_to = params[:map_to_bioportal_ontology_id]
+      concept_to_id = params[:map_to_bioportal_full_id]
+      external = false
+    end
+    [ontology_to, concept_to_id, external]
+  end
+
+  def get_mappings_target
+    ontology_to, concept_to_id, external_mapping = get_mappings_target_params
+    target = ''
+    if external_mapping
+      target_ontology = ontology_to
+      target = concept_to_id
+    else
+      if helpers.link?(ontology_to)
+        target_ontology = LinkedData::Client::Models::Ontology.find(ontology_to)
+      else
+        target_ontology = LinkedData::Client::Models::Ontology.find_by_acronym(ontology_to).first
+      end
+      if target_ontology
+        target = target_ontology.explore.single_class(concept_to_id).id
+        target_ontology = target_ontology.id
+      end
+    end
+    [target_ontology, target, external_mapping]
+  end
+end
diff --git a/app/controllers/ontolobridge_controller.rb b/app/controllers/ontolobridge_controller.rb
deleted file mode 100644
index 89d3d62b6d..0000000000
--- a/app/controllers/ontolobridge_controller.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'rest-client'
-require 'multi_json'
-
-class OntolobridgeController < ApplicationController
-
-  # POST /ontolobridge
-  # POST /ontolobridge.xml
-  def create
-    request_term
-  end
-
-  def request_term
-    response = {}
-    endpoint = "/RequestTerm"
-    h_params = {}
-    response_raw = nil
-    code = 200
-
-    begin
-      params.delete("controller")
-      params.delete("action")
-      params.each { |k, v|
-        if v === "on"
-          h_params[k] = true
-        else
-          h_params[k] = v
-        end
-      }
-
-      headers = {'Authorization' => $ONTOLOBRIDGE_AUTHENTICATION_TOKEN}
-      response_raw = RestClient.post("#{$ONTOLOBRIDGE_BASE_URL}#{endpoint}", h_params, headers)
-      code = response_raw.code
-      response.merge!(MultiJson.load(response_raw))
-    rescue RestClient::BadRequest => e
-      code = 400
-      response["error"] = e.message
-    rescue Exception => e
-      code = 500
-      response["error"] = t('ontolobridge.problem_of_creating_new_term', endpoint: endpoint, class: e.class, message: e.message)
-    end
-
-    render json: [response, code], status: code
-  end
-
-  def save_new_term_instructions
-    code = 200
-    response = {error: '', success: ''}
-    response[:success] = t('ontolobridge.new_term_instructions_saved', acronym: params['acronym'])
-    ont_data = Ontology.find_by(acronym: params['acronym'])
-    ont_data ||= Ontology.new
-    ont_data.acronym = params['acronym']
-    ont_data.new_term_instructions = params['new_term_instructions']
-
-    begin
-      ont_data.save
-    rescue Exception => e
-      code = 500
-      response[:error] = t('ontolobridge.error_saving_new_term_instructions', acronym: params['acronym'])
-    end
-    sleep(1)
-    render json: [response, code], status: code
-  end
-
-end
diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb
index 7e67bb7cb7..793a0f7a14 100644
--- a/app/controllers/ontologies_controller.rb
+++ b/app/controllers/ontologies_controller.rb
@@ -276,7 +276,6 @@ def show
       params[:p] = "summary"
     end
 
-    #@ob_instructions = helpers.ontolobridge_instructions_template(@ontology)
 
     # Get the latest submission (not necessarily the latest 'ready' submission)
 
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 490072b4bd..5816730466 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -26,13 +26,13 @@ def show
       redirect_to projects_path
       return
     end
-    
+
     @project = projects.first
     @ontologies_used = []
     onts_used = @project.ontologyUsed
     onts_used.each do |ont_used|
       ont = LinkedData::Client::Models::Ontology.find(ont_used)
-      unless ont.nil?
+      unless ont.nil? || ont.errors
         @ontologies_used << Hash["name", ont.name, "acronym", ont.acronym]
       end
     end
@@ -62,7 +62,7 @@ def edit
     @project = projects.first
     @user_select_list = LinkedData::Client::Models::User.all.map {|u| [u.username, u.id]}
     @user_select_list.sort! {|a,b| a[1].downcase <=> b[1].downcase}
-    @usedOntologies = @project.ontologyUsed || []
+    @usedOntologies = @project.ontologyUsed&.map{|o| o.split('/').last}
     @ontologies = LinkedData::Client::Models::Ontology.all
   end
 
@@ -76,7 +76,7 @@ def create
 
     @project = LinkedData::Client::Models::Project.new(values: project_params)
     @project_saved = @project.save
-    
+
     # Project successfully created.
     if response_success?(@project_saved)
       flash[:notice] = t('projects.project_successfully_created')
@@ -160,10 +160,10 @@ def destroy
   def project_params
     p = params.require(:project).permit(:name, :acronym, :institution, :contacts, { creator:[] }, :homePage,
                                         :description, { ontologyUsed:[] })
-
+                                        
     p[:creator]&.reject!(&:blank?)
-    p[:ontologyUsed]&.reject!(&:blank?)
-    p.to_h
+    p[:ontologyUsed] ||= []
+    p = p.to_h
   end
 
   def flash_error(msg)
diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb
index 8c5c97f1f0..1116e6a740 100644
--- a/app/controllers/schemes_controller.rb
+++ b/app/controllers/schemes_controller.rb
@@ -23,9 +23,9 @@ def index
 
 
       render inline: helpers.render_search_paginated_list(container_id: 'schemes_sorted_list',
-                         next_page_url: "/ontologies/#{@ontology.acronym}/schemes",
-                         child_url: "/ontologies/#{@ontology.acronym}/schemes/show", child_turbo_frame: 'scheme',
-                         child_param: :schemeid,
+                                                          next_page_url: "/ontologies/#{@ontology.acronym}/schemes",
+                                                          child_url: "/ontologies/#{@ontology.acronym}/schemes/show", child_turbo_frame: 'scheme',
+                                                          child_param: :schemeid,
                          results:  results, next_page:  next_page, total_count: total_count)
 
     end
@@ -35,7 +35,7 @@ def show
     redirect_to(ontology_path(id: params[:ontology], p: 'schemes', schemeid: params[:id],lang: request_lang)) and return unless turbo_frame_request?
 
     @scheme = get_request_scheme
-    
+
     render partial: "schemes/show"
   end
 
@@ -43,8 +43,9 @@ def show_label
     scheme = get_request_scheme
     scheme_label = scheme ? scheme['prefLabel'] : params[:id]
     scheme_label = scheme_label.nil? || scheme_label.empty? ? params[:id] : scheme_label
-
-    render LabelLinkComponent.inline(params[:id], helpers.main_language_label(scheme_label))
+    label = helpers.main_language_label(scheme_label)
+    link = scheme_path(scheme_id: params[:id], ontology_id: params[:ontology_id])
+    render(inline: helpers.ajax_link_chip(params[:id], label, link, external: scheme.blank?), layout: false)
   end
 
   private
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b46440f674..f11d494a32 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -9,7 +9,7 @@ module ApplicationHelper
   REST_URI = $REST_URL
   API_KEY = $API_KEY
 
-  include ModalHelper, MultiLanguagesHelper, UrlsHelper
+  include ModalHelper, MultiLanguagesHelper, UrlsHelper, ComponentsHelper
 
 
   RESOLVE_NAMESPACE = {:omv => "http://omv.ontoware.org/2005/05/ontology#", :skos => "http://www.w3.org/2004/02/skos/core#", :owl => "http://www.w3.org/2002/07/owl#",
@@ -19,7 +19,7 @@ module ApplicationHelper
                         :umls => "http://bioportal.bioontology.org/ontologies/umls/", :door => "http://kannel.open.ac.uk/ontology#", :dct => "http://purl.org/dc/terms/",
                         :void => "http://rdfs.org/ns/void#", :foaf => "http://xmlns.com/foaf/0.1/", :vann => "http://purl.org/vocab/vann/", :adms => "http://www.w3.org/ns/adms#",
                         :voaf => "http://purl.org/vocommons/voaf#", :dcat => "http://www.w3.org/ns/dcat#", :mod => "http://www.isibang.ac.in/ns/mod#", :prov => "http://www.w3.org/ns/prov#",
-                       :cc => "http://creativecommons.org/ns#", :schema => "http://schema.org/", :doap => "http://usefulinc.com/ns/doap#", :bibo => "http://purl.org/ontology/bibo/",
+                        :cc => "http://creativecommons.org/ns#", :schema => "http://schema.org/", :doap => "http://usefulinc.com/ns/doap#", :bibo => "http://purl.org/ontology/bibo/",
                        :wdrs => "http://www.w3.org/2007/05/powder-s#", :cito => "http://purl.org/spar/cito/", :pav => "http://purl.org/pav/", :nkos => "http://w3id.org/nkos/nkostype#",
                        :oboInOwl => "http://www.geneontology.org/formats/oboInOwl#", :idot => "http://identifiers.org/idot/", :sd => "http://www.w3.org/ns/sparql-service-description#",
                        :cclicense => "http://creativecommons.org/licenses/",
@@ -55,7 +55,6 @@ def get_apikey
     end
   end
 
-
   def omniauth_providers_info
     $OMNIAUTH_PROVIDERS || []
   end
@@ -76,7 +75,6 @@ def current_user_admin?
     session[:user] && session[:user].admin?
   end
 
-
   def child_id(child)
     child.id.to_s.split('/').last
   end
@@ -107,20 +105,23 @@ def error_message_alert
   end
 
   def onts_for_select(include_views: false)
-    ontologies ||= LinkedData::Client::Models::Ontology.all({include: "acronym,name", include_views: include_views})
+    ontologies ||= LinkedData::Client::Models::Ontology.all({include: "acronym,name,viewOf", include_views: include_views})
     onts_for_select = [['', '']]
     ontologies.each do |ont|
       next if ( ont.acronym.nil? or ont.acronym.empty? )
       acronym = ont.acronym
       name = ont.name
       abbreviation = acronym.empty? ? "" : "(#{acronym})"
-      ont_label = "#{name.strip} #{abbreviation}"
+      ont_label = "#{name.strip} #{abbreviation}#{ont.viewOf ? ' [view]' : ''}"
       onts_for_select << [ont_label, acronym]
     end
     onts_for_select.sort! { |a,b| a[0].downcase <=> b[0].downcase }
     onts_for_select
   end
 
+  def slices_enabled?
+    $ENABLE_SLICES.eql?(true)
+  end
 
   def at_slice?
     !@subdomain_filter.nil? && !@subdomain_filter[:active].nil? && @subdomain_filter[:active] == true
@@ -128,7 +129,7 @@ def at_slice?
 
   def add_comment_button(parent_id, parent_type)
     if session[:user].nil?
-      link_to t('application.add_comment'),  login_index_path(redirect: request.url), class: "secondary-button regular-button slim"
+      link_to t('application.add_comment'),  login_index_path(redirect: request.url), class: "secondary-button regular-button slim", data: {'turbo-frame': '_top'}
     else
       link_to_modal t('application.add_comment'), notes_new_comment_path(parent_id: parent_id, parent_type: parent_type, ontology_id: @ontology.acronym),
                     class: "secondary-button regular-button slim", data: { show_modal_title_value: t('application.add_new_comment')}
@@ -145,14 +146,13 @@ def add_reply_button(parent_id)
 
   def add_proposal_button(parent_id, parent_type)
     if session[:user].nil?
-      link_to t('application.add_proposal'),  login_index_path(redirect: request.url), class: "secondary-button regular-button slim"
+      link_to t('application.add_proposal'),  login_index_path(redirect: request.url), class: "secondary-button regular-button slim",  data: {'turbo-frame': '_top'}
     else
       link_to_modal t('application.add_proposal'), notes_new_proposal_path(parent_id: parent_id, parent_type: parent_type, ontology_id: @ontology.acronym),
                     class: "secondary-button regular-button slim", data: { show_modal_title_value: t('application.add_new_proposal')}
     end
   end
 
-
   def subscribe_button(ontology_id)
     return if ontology_id.nil?
     render TurboFrameComponent.new(id: 'subscribe_button', src: ontology_subscriptions_path(ontology_id: ontology_id.split('/').last), class: 'ml-1') do |t|
@@ -175,21 +175,15 @@ def admin_block(ontology: @ontology, user: session[:user], class_css: "admin-bor
   end
 
   def subscribed_to_ontology?(ontology_acronym, user)
-    user = LinkedData::Client::Models::User.find(user.username, {include: 'subscription'}) if user.subscription.nil?
+    user = LinkedData::Client::Models::User.find(user.username, {include: 'all'}) if user.subscription.nil?
     return false if user.subscription.nil? or user.subscription.empty?
     user.subscription.each do |sub|
-      #sub = {ontology: ontology_acronym, notification_type: "NOTES"}
       sub_ont_acronym = sub[:ontology] ?  sub[:ontology].split('/').last : nil #  make sure we get the acronym, even if it's a full URI
       return true if sub_ont_acronym == ontology_acronym
     end
     return false
   end
 
-  def ontolobridge_instructions_template(ontology)
-    ont_data = Ontology.find_by(acronym: ontology.acronym)
-    ont_data.nil? || ont_data.new_term_instructions.empty? ? t('concepts.request_term.new_term_instructions') : ont_data.new_term_instructions
-  end
-
   # http://stackoverflow.com/questions/1293573/rails-smart-text-truncation
   def smart_truncate(s, opts = {})
     opts = {:words => 20}.merge(opts)
@@ -223,95 +217,40 @@ def notification_type(flash_key)
     bootstrap_alert_class[flash_key]
   end
 
-  def bp_ont_link(ont_acronym)
-    return "/ontologies/#{ont_acronym}"
-  end
-
-  def bp_class_link(cls_id, ont_acronym)
-    return "#{bp_ont_link(ont_acronym)}?p=classes&conceptid=#{escape(cls_id)}&language=#{request_lang}"
-  end
-
-  def bp_scheme_link(scheme_id, ont_acronym)
-    return "#{bp_ont_link(ont_acronym)}?p=schemes&schemeid=#{escape(scheme_id)}"
-  end
-
-  def bp_label_xl_link(label_xl_id, ont_acronym)
-    return "#{bp_ont_link(ont_acronym)}/?label_xl_id=#{escape(label_xl_id)}"
-  end
-
-  def bp_collection_link(collection_id, ont_acronym)
-    "#{bp_ont_link(ont_acronym)}?p=collection&collectionid=#{escape(collection_id)}"
-  end
-
-  def label_ajax_data_h(cls_id, ont_acronym, ajax_uri, cls_url)
-    { data:
-        {
-          'label-ajax-cls-id-value': cls_id,
-          'label-ajax-ontology-acronym-value': ont_acronym,
-          'label-ajax-ajax-url-value': ajax_uri,
-          'label-ajax-cls-id-url-value': cls_url
-        }
-    }
-  end
-
-  def label_ajax_data(cls_id, ont_acronym, ajax_uri, cls_url)
-    label_ajax_data_h(cls_id, ont_acronym, ajax_uri, cls_url)
-  end
+  def label_ajax_link(id, ont_acronym, ajax_uri, target)
+    ajax_uri = if ajax_uri.include?('?')
+                 "#{ajax_uri}&ontology=#{ont_acronym}&id=#{escape(id)}"
+               else
+                 "#{ajax_uri}?ontology=#{ont_acronym}&id=#{escape(id)}"
+               end
 
-  def label_ajax_link(link, cls_id, ont_acronym, ajax_uri, cls_url, target = nil)
-    data = label_ajax_data(cls_id, ont_acronym, ajax_uri, cls_url)
-    options = {  'data-controller': 'label-ajax' }.merge(data)
-    options = options.merge({ target: target }) if target
-    content_tag(:span, class: 'mx-1') do
-      render ChipButtonComponent.new(url: link, text: cls_id, type: 'clickable', **options)
+    content_tag(:span, class: 'concepts-mapping-count') do
+      ajax_link_chip(id, ajax_src: ajax_uri, target: target)
     end
   end
 
   def get_link_for_cls_ajax(cls_id, ont_acronym, target = nil)
     if cls_id.start_with?('http://') || cls_id.start_with?('https://')
-      link = bp_class_link(cls_id, ont_acronym)
       ajax_url = '/ajax/classes/label'
-      cls_url = "/ontologies/#{ont_acronym}?p=classes&conceptid=#{CGI.escape(cls_id)}"
-      label_ajax_link(link, cls_id, ont_acronym, ajax_url , cls_url ,target)
+      label_ajax_link(cls_id, ont_acronym, ajax_url, target)
     else
       content_tag(:div, cls_id)
     end
   end
 
-  def get_link_for_ont_ajax(ont_acronym)
-    # ajax call will replace the acronym with an ontology name (triggered by class='ont4ajax')
-    href_ont = " href='#{bp_ont_link(ont_acronym)}' "
-    data_ont = " data-ont='#{ont_acronym}' "
-    return "<a class='ont4ajax' #{data_ont} #{href_ont}>#{ont_acronym}</a>"
-  end
-
   def get_link_for_scheme_ajax(scheme, ont_acronym, target = '_blank')
-    link = bp_scheme_link(scheme, ont_acronym)
     ajax_url = "/ajax/schemes/label?language=#{request_lang}"
-    scheme_url = "?p=schemes&schemeid=#{CGI.escape(scheme)}"
-    label_ajax_link(link, scheme, ont_acronym, ajax_url, scheme_url, target)
+    label_ajax_link(scheme, ont_acronym, ajax_url, target)
   end
 
   def get_link_for_collection_ajax(collection, ont_acronym, target = '_blank')
-    link = bp_collection_link(collection, ont_acronym)
     ajax_url = "/ajax/collections/label?language=#{request_lang}"
-    collection_url = "?p=collections&collectionid=#{CGI.escape(collection)}"
-    label_ajax_link(link, collection, ont_acronym, ajax_url, collection_url, target)
-  end
-
-  def get_link_for_label_xl_ajax(label_xl, ont_acronym, cls_id, modal: true)
-    link = label_xl
-    ajax_uri = "/ajax/label_xl/label?cls_id=#{CGI.escape(cls_id)}"
-    label_xl_url = "/ajax/label_xl/?id=#{CGI.escape(label_xl)}&ontology=#{ont_acronym}&cls_id=#{CGI.escape(cls_id)}"
-    data = label_ajax_data_h(label_xl, ont_acronym, ajax_uri, label_xl_url)
-    data[:data][:controller] = 'label-ajax'
-    if modal
-      link_to_modal(cls_id, link, {data: data[:data] , class: 'btn btn-sm btn-light m-1'})
-    else
-      link_to(link,'', {data: data[:data], class: 'btn btn-sm btn-light m-1', target: '_blank'})
-    end
-
+    label_ajax_link(collection, ont_acronym, ajax_url, target)
+  end
 
+  def get_link_for_label_xl_ajax(label_xl, ont_acronym, cls_id, target = nil)
+    ajax_url = "/ajax/label_xl/label?cls_id=#{CGI.escape(cls_id)}"
+    label_ajax_link(label_xl, ont_acronym, ajax_url, target)
   end
 
   def ontology_viewer_page_name(ontology_name, concept_label, page)
@@ -449,14 +388,14 @@ def prefixed_url(url)
   def show_advanced_options_button(text: nil, init: nil)
     content_tag(:div, class: "#{init ? 'd-none' : ''} advanced-options-button", 'data-action': 'click->reveal-component#show', 'data-reveal-component-target': 'showButton') do
       inline_svg_tag('icons/settings.svg') +
-      content_tag(:div, text, class: 'text')
+        content_tag(:div, text, class: 'text')
     end
   end
 
   def hide_advanced_options_button(text: nil, init: nil)
     content_tag(:div, class: "#{init ? '' : 'd-none'} advanced-options-button", 'data-action': 'click->reveal-component#hide', 'data-reveal-component-target': 'hideButton') do
       inline_svg_tag('icons/hide.svg') +
-      content_tag(:div, text, class: 'text')
+        content_tag(:div, text, class: 'text')
     end
   end
 
diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb
index b366a1401c..f8593cba2e 100644
--- a/app/helpers/collections_helper.rb
+++ b/app/helpers/collections_helper.rb
@@ -1,4 +1,5 @@
 module CollectionsHelper
+  include MultiLanguagesHelper, UrlsHelper
 
 
   def get_collections(ontology, add_colors: false)
@@ -48,8 +49,8 @@ def no_collections_alert
     end
   end
 
-  def collection_path(collection_id = '', language = '')
-    "/ontologies/#{@ontology.acronym}/collections/show?id=#{escape(collection_id)}&language=#{language}"
+  def collection_path(collection_id: '', ontology_id: @ontology.acronym, language: request_lang)
+    "/ontologies/#{ontology_id}/collections/show?id=#{escape(collection_id)}&language=#{language}"
   end
 
   def request_collection_id
@@ -64,8 +65,8 @@ def link_to_collection(collection, selected_collection_id)
     pref_label_lang, pref_label_html = get_collection_label(collection)
     tooltip  = pref_label_lang.to_s.eql?('@none') ? '' :  "data-controller='tooltip' data-tooltip-position-value='right' title='#{pref_label_lang.upcase}'"
     <<-EOS
-          <a id="#{collection['@id']}" href="#{collection_path(collection['@id'], request_lang)}"
-            data-turbo="true" data-turbo-frame="collection" data-collectionid="#{collection['@id']}"
+          <a id="#{collection['@id']}" href="#{collection_path(collection_id: collection['@id'], ontology_id: @ontology.acronym, language: request_lang)}"
+            data-turbo="true" data-turbo-frame="collection" data-collectionid="#{collection['@id']}" 
            #{tooltip}
             class="#{selected_collection_id.eql?(collection['@id']) ? 'active' : nil}">
               #{pref_label_html}
diff --git a/app/helpers/components_helper.rb b/app/helpers/components_helper.rb
index d0f1879a2a..97fded4d03 100644
--- a/app/helpers/components_helper.rb
+++ b/app/helpers/components_helper.rb
@@ -107,7 +107,7 @@ def paginated_list_component(id:, results:, next_page_url:, child_url:, child_tu
   end
 
   def resolvability_check_tag(url)
-    content_tag(:span, check_resolvability_container(url), style: 'display: inline-block;', onClick: "window.open('#{check_resolvability_url(url: url)}', '_blank');")
+    content_tag(:span, check_resolvability_container(url),  class: 'resolvability-check',style: 'display: inline-block;', onClick: "window.open('#{check_resolvability_url(url: url)}', '_blank');")
   end
 
   def rounded_button_component(link)
@@ -172,6 +172,10 @@ def tree_component(root, selected, target_frame:, sub_tree: false, id: nil, auto
     end
   end
 
+  def ajax_link_chip(id, label = nil, link = nil, external: false, open_in_modal: false, ajax_src: nil, target: '_blank')
+    render LabelFetcherComponent.new(id: id, label: label, link: link, open_in_modal: open_in_modal, ajax_src: ajax_src, target: target, external: external)
+  end
+
   def chart_component(title: '', type:, labels:, datasets:, index_axis: 'x', show_legend: false)
     data = {
       controller: 'load-chart',
@@ -270,8 +274,8 @@ def regular_button(id, value, variant: "secondary", state: "regular", size: "sli
     end
   end
 
-  def form_save_button
-    render Buttons::RegularButtonComponent.new(id: 'save-button', value: t('components.save_button'), variant: "primary", size: "slim", type: "submit") do |btn|
+  def form_save_button(enable_loading: true)
+    render Buttons::RegularButtonComponent.new(id: 'save-button', value: t('components.save_button'), variant: "primary", size: "slim", type: "submit", state: enable_loading ? 'animate' : '') do |btn|
       btn.icon_left do
         inline_svg_tag "check.svg"
       end
diff --git a/app/helpers/concepts_helper.rb b/app/helpers/concepts_helper.rb
index 3cec8ade6b..1b62c06d76 100644
--- a/app/helpers/concepts_helper.rb
+++ b/app/helpers/concepts_helper.rb
@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 module ConceptsHelper
-  include TermsReuses
+  include TermsReuses, UrlsHelper
+
+  def concept_path(id, ontology_id, language)
+    "/ontologies/#{ontology_id}?p=classes&conceptid=#{escape(id)}&language=#{language}"
+  end
+
   def concept_link(acronym, child, language)
     child.id.eql?('bp_fake_root') ? '#' : "/ontologies/#{acronym}/concepts/show?id=#{CGI.escape(child.id)}&language=#{language}"
   end
@@ -76,14 +81,9 @@ def default_sub_menu_class
   def concept_label(ont_id, cls_id)
     @ontology = LinkedData::Client::Models::Ontology.find(ont_id)
     @ontology ||= LinkedData::Client::Models::Ontology.find_by_acronym(ont_id).first
-    ontology_not_found(ont_id) unless @ontology
-    # Retrieve a class prefLabel or return the class ID (URI)
-    # - mappings may contain class URIs that are not in bioportal (e.g. obo-xrefs)
+    ontology_not_found(ont_id) if @ontology.nil? || @ontology.errors
     cls = @ontology.explore.single_class({language: request_lang, include: 'prefLabel'}, cls_id)
-    # TODO: log any cls.errors
-    # TODO: NCBO-402 might be implemented here, but it throws off a lot of ajax result rendering.
-    #cls_label = cls.prefLabel({:use_html => true}) || cls_id
-    cls.prefLabel || cls_id
+    cls&.prefLabel || cls_id
   end
 
   def concept_id_param_exist?(params)
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
index 2ddcdc5275..d521b517e1 100644
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@@ -13,6 +13,8 @@ def render_footer_link(options = {})
 
 
   def format_number_abbreviated(number)
+    number = 0 if number.nil?
+
     if number >= 1_000_000
       (number / 1_000_000).to_s + 'M'
     elsif number >= 1_000
diff --git a/app/helpers/mappings_helper.rb b/app/helpers/mappings_helper.rb
index bfe583a41b..129b1e4bf8 100644
--- a/app/helpers/mappings_helper.rb
+++ b/app/helpers/mappings_helper.rb
@@ -2,57 +2,79 @@ module MappingsHelper
 
   # Used to replace the full URI by the prefixed URI
   RELATIONSHIP_PREFIX = {
-    "http://www.w3.org/2004/02/skos/core#" => "skos:",
-    "http://www.w3.org/2000/01/rdf-schema#" => "rdfs:",
-    "http://www.w3.org/2002/07/owl#" => "owl:",
-    "http://www.w3.org/1999/02/22-rdf-syntax-ns#" => "rdf:",
-    "http://purl.org/linguistics/gold/" => "gold:",
-    "http://lemon-model.net/lemon#" => "lemon:"
+    'http://www.w3.org/2004/02/skos/core#' => 'skos:',
+    'http://www.w3.org/2000/01/rdf-schema#' => 'rdfs:',
+    'http://www.w3.org/2002/07/owl#' => 'owl:',
+    'http://www.w3.org/1999/02/22-rdf-syntax-ns#' => 'rdf:',
+    'http://purl.org/linguistics/gold/' => 'gold:',
+    'http://lemon-model.net/lemon#' => 'lemon:'
   }
 
   INTERPORTAL_HASH = $INTERPORTAL_HASH
 
-
-  # a little method that returns true if the URIs array contain a gold:translation or gold:freeTranslation
-  def translation?(relation_array)
-    if relation_array.kind_of?(Array)
-      relation_array.map!(&:downcase)
-      if relation_array.include? "http://purl.org/linguistics/gold/translation"
-        true
-      elsif relation_array.include? "http://purl.org/linguistics/gold/freetranslation"
-        true
-      else
-        false
-      end
+  def mapping_links(mapping, concept)
+    target_concept = mapping.classes.select do |c|
+      c.id != concept.id && c.links['ontology'] != concept.links['ontology']
+    end.first
+    target_concept ||= mapping.classes.last
+    process = mapping.process || {}
+
+    if inter_portal_mapping?(target_concept)
+      cls_link = target_concept.id
+      ont_name = target_concept.links['ontology']
+      ont_link = link_to ont_name, get_inter_portal_ui_link(ont_name, process['name']), target: '_blank'
+      source_tooltip = 'Internal-portal'
+    elsif internal_mapping?(target_concept)
+      ont_name = target_concept.links['ontology'].split('/').last
+      ont_link = link_to ont_name, ontology_path(ont_name), 'data-turbo-frame': '_top'
+      cls_link = raw(get_link_for_cls_ajax(target_concept.id, ont_name, '_top'))
+      source_tooltip = 'Internal'
     else
-      false
+      cls_label = ExternalLinkTextComponent.new(text: target_concept.links['self']).call
+      cls_link = raw("<a href='#{target_concept.links['self']}' target='_blank'>#{cls_label}</a>")
+      ont_name = target_concept.links['ontology']
+      ont_link = link_to ExternalLinkTextComponent.new(text: ont_name).call, target_concept.links['ontology'],
+                         target: '_blank'
+      source_tooltip = 'External'
     end
+
+    [cls_link, ont_link, source_tooltip]
+  end
+
+  def mapping_prefixed_relations(mapping)
+    process = mapping.process || {}
+    Array(process[:relation]).each { |relation| get_prefixed_uri(relation) }
+  end
+
+  def mapping_type_tooltip(map)
+    relations = mapping_prefixed_relations(map)
+    process = map.process || {}
+    type = if map.source.to_s.include? 'SKOS'
+             'SKOS'
+           else
+             map.source
+           end
+    types_description = {
+      'CUI' => t('mappings.types_description.cui'),
+      'LOOM' => t('mappings.types_description.loom'),
+      'REST' => t('mappings.types_description.rest'),
+      'SAME_URI' => t('mappings.types_description.same_uri'),
+      'SKOS' => t('mappings.types_description.skos')
+    }
+    type_tooltip = content_tag(:div, "#{map.source} #{relations.join(', ')} : #{types_description[type]} #{process[:source_name]}".strip, style: 'width: 300px')
+    [type, type_tooltip]
   end
 
   # a little method that returns the uri with a prefix : http://purl.org/linguistics/gold/translation become gold:translation
   def get_prefixed_uri(uri)
     RELATIONSHIP_PREFIX.each { |k, v| uri.sub!(k, v) }
-    return uri
-  end
-
-  # method to get (using http) prefLabel for interportal classes
-  # Using bp_ajax_controller.ajax_process_interportal_cls will try to resolve class labels.
-  def ajax_to_inter_portal_cls(cls)
-    inter_portal_acronym = get_inter_portal_acronym(cls.links["ui"])
-    href_cls = " href='#{cls.links["ui"]}' "
-    if inter_portal_acronym
-      data_cls = " data-cls='#{cls.links["self"]}?apikey=' "
-      portal_cls = " portal-cls='#{inter_portal_acronym}' "
-      raw("<a class='interportalcls4ajax' #{data_cls} #{portal_cls} #{href_cls} target='_blank'>#{cls.id}</a>")
-    else
-      raw("<a #{href_cls} target='_blank'>#{cls.id}</a>")
-    end
-
+    uri
   end
 
   def ajax_to_internal_cls(cls)
-    link_to("#{cls.id}<span href='/ajax/classes/label?ontology=#{cls.links["ontology"]}&concept=#{escape(cls.id)}' class='get_via_ajax'></span>".html_safe,
-            ontology_path(cls.explore.ontology.acronym, p: 'classes', conceptid: cls.id), target: "_blank")
+    cls_id = cls.id
+    ont_acronym = cls.links['ontology'].split('/').last
+    get_link_for_cls_ajax(cls_id, ont_acronym, '_blank')
   end
 
   # to get the apikey from the interportal instance of the interportal class.
@@ -60,7 +82,7 @@ def ajax_to_internal_cls(cls)
   def get_inter_portal_acronym(class_ui_url)
     if !INTERPORTAL_HASH.nil?
       INTERPORTAL_HASH.each do |key, value|
-        if class_ui_url.start_with?(value["ui"])
+        if class_ui_url.start_with?(value['ui'])
           return key
         else
           return nil
@@ -69,28 +91,25 @@ def get_inter_portal_acronym(class_ui_url)
     end
   end
 
-  # method to extract the prefLabel from the external class URI
-  def get_label_for_external_cls(class_uri)
-    if class_uri.include? "#"
-      prefLabel = class_uri.split("#")[-1]
-    else
-      prefLabel = class_uri.split("/")[-1]
-    end
-    return prefLabel
-  end
-
   def ajax_to_external_cls(cls)
-    raw("<a href='#{cls.links['self']}' target='_blank'>#{get_label_for_external_cls(cls.id)}</a>")
+    class_uri = cls.id
+    text = if class_uri.include? '#'
+             class_uri.split('#')[-1]
+           else
+             class_uri.split('/')[-1]
+           end
+    text = render(ExternalLinkTextComponent.new(text: text))
+    link_to text, cls.links['self'], target: '_blank'
   end
 
   # Replace the inter_portal mapping ontology URI (that link to the API) by the link to the ontology in the UI
   def get_inter_portal_ui_link(uri, process_name)
     process_name = '' if process_name.nil?
-    interportal_acronym = process_name.split(" ")[2]
-    if interportal_acronym.nil? || interportal_acronym.empty?
+    interportal_acronym = process_name.split(' ')[2]
+    if interportal_acronym.nil? || interportal_acronym.empty? || INTERPORTAL_HASH[interportal_acronym].nil?
       uri
     else
-      uri.sub!(INTERPORTAL_HASH[interportal_acronym]["api"], INTERPORTAL_HASH[interportal_acronym]["ui"])
+      uri.sub!(INTERPORTAL_HASH[interportal_acronym]['api'], INTERPORTAL_HASH[interportal_acronym]['ui'])
     end
   end
 
@@ -99,66 +118,14 @@ def internal_mapping?(cls)
   end
 
   def inter_portal_mapping?(cls)
-    !internal_mapping?(cls) && cls.links.has_key?("ui")
-  end
-
-  def get_mappings_target_params
-    mapping_type = Array(params[:mapping_type]).first
-    external = true
-    case mapping_type
-    when 'interportal'
-      ontology_to = "#{params[:map_to_interportal]}/ontologies/#{params[:map_to_interportal_ontology]}"
-      concept_to_id = params[:map_to_interportal_class]
-    when 'external'
-      ontology_to = params[:map_to_external_ontology]
-      concept_to_id = params[:map_to_external_class]
-    else
-      ontology_to = params[:map_to_bioportal_ontology_id]
-      concept_to_id = params[:map_to_bioportal_full_id]
-      external = false
-    end
-    [ontology_to, concept_to_id, external]
-  end
-
-  def set_mapping_target(concept_to_id:, ontology_to:, mapping_type: )
-    case mapping_type
-    when 'interportal'
-      @map_to_interportal, @map_to_interportal_ontology = ontology_to.match(%r{(.*)/ontologies/(.*)}).to_a[1..]
-      @map_to_interportal_class = concept_to_id
-    when 'external'
-      @map_to_external_ontology = ontology_to
-      @map_to_external_class = concept_to_id
-    else
-      @map_to_bioportal_ontology_id = ontology_to
-      @map_to_bioportal_full_id = concept_to_id
-    end
-  end
-
-  def get_mappings_target
-    ontology_to, concept_to_id, external_mapping = get_mappings_target_params
-    target = ''
-    if external_mapping
-      target_ontology = ontology_to
-      target = concept_to_id
-    else
-      if helpers.link?(ontology_to)
-        target_ontology = LinkedData::Client::Models::Ontology.find(ontology_to)
-      else
-        target_ontology = LinkedData::Client::Models::Ontology.find_by_acronym(ontology_to).first
-      end
-      if target_ontology
-        target = target_ontology.explore.single_class(concept_to_id).id
-        target_ontology = target_ontology.id
-      end
-    end
-    [target_ontology, target, external_mapping]
+    !internal_mapping?(cls) && cls.links.has_key?('ui')
   end
 
   def type?(type)
     @mapping_type.nil? && type.eql?('internal') || @mapping_type.eql?(type)
   end
 
-  def concept_mappings_loader(ontology_acronym: ,concept_id: )
+  def concept_mappings_loader(ontology_acronym:, concept_id:)
     content_tag(:span, id: 'mapping_count') do
       concat(content_tag(:div, class: 'concepts-mapping-count ml-1 mr-1') do
         render(TurboFrameComponent.new(
@@ -173,21 +140,23 @@ def concept_mappings_loader(ontology_acronym: ,concept_id: )
   end
 
   def client_filled_modal
-    link_to_modal "", ""
+    link_to_modal '', ''
   end
 
   def mappings_bubble_view_legend
     content_tag(:div, class: 'mappings-bubble-view-legend') do
-      mappings_legend_section(t('mappings.bubble_view_legend.bubble_size'), t('mappings.bubble_view_legend.bubble_size_desc'), 'mappings-bubble-size-legend') +
+      mappings_legend_section(t('mappings.bubble_view_legend.bubble_size'),
+                              t('mappings.bubble_view_legend.bubble_size_desc'), 'mappings-bubble-size-legend') +
         mappings_legend_section(
-          t('mappings.bubble_view_legend.color_degree'),t('mappings.bubble_view_legend.color_degree_desc'),'mappings-bubble-color-legend') +
+          t('mappings.bubble_view_legend.color_degree'), t('mappings.bubble_view_legend.color_degree_desc'), 'mappings-bubble-color-legend') +
         content_tag(:div, class: 'content-container') do
           content_tag(:div, class: 'bubble-view-legend-item') do
             content_tag(:div, class: 'title') do
-              content_tag(:div, t('mappings.bubble_view_legend.yellow_bubble'), class: 'd-inline') + content_tag(:span, t('mappings.bubble_view_legend.selected_bubble'))
+              content_tag(:div, t('mappings.bubble_view_legend.yellow_bubble'),
+                          class: 'd-inline') + content_tag(:span, t('mappings.bubble_view_legend.selected_bubble'))
             end +
-              content_tag(:div, class: "mappings-bubble-size-legend d-flex justify-content-center") do
-                content_tag(:div, '', class: "bubble yellow")
+              content_tag(:div, class: 'mappings-bubble-size-legend d-flex justify-content-center') do
+                content_tag(:div, '', class: 'bubble yellow')
               end
           end
         end
@@ -209,7 +178,7 @@ def mappings_legend_section(title_text, description_text, css_class)
   def mappings_legend(css_class)
     content_tag(:div, class: css_class) do
       content_tag(:div, t('mappings.bubble_view_legend.less_mappings'), class: 'mappings-legend-text') +
-        (1..6).map { |i| content_tag(:div, "", class: "bubble bubble#{i}") }.join.html_safe +
+        (1..6).map { |i| content_tag(:div, '', class: "bubble bubble#{i}") }.join.html_safe +
         content_tag(:div, t('mappings.bubble_view_legend.more_mappings'), class: 'mappings-legend-text')
     end
   end
diff --git a/app/helpers/multi_languages_helper.rb b/app/helpers/multi_languages_helper.rb
index 9e21f2e0ed..ada13053b1 100644
--- a/app/helpers/multi_languages_helper.rb
+++ b/app/helpers/multi_languages_helper.rb
@@ -22,6 +22,10 @@ def portal_languages
     }
   end
 
+  def portal_language_enabled?(lang)
+    portal_languages.reject { |_k, x| x[:disabled] }.keys.include?(lang)
+  end
+
   def portal_language_selector
     languages = portal_languages
     selected_language = portal_lang
@@ -153,7 +157,7 @@ def select_language_label(concept_label, platform_languages = %i[en fr])
       end
     end
 
-    concept_value || concept.to_a.first
+    concept_value || concept.reject { |k| k.to_s.eql?('@none') }.first || concept.first
   end
 
   def main_language_label(label)
diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb
index 1cfe84c87f..1c6180b6f1 100644
--- a/app/helpers/ontologies_helper.rb
+++ b/app/helpers/ontologies_helper.rb
@@ -544,12 +544,15 @@ def render_concepts_json_button(link)
 
   def ontology_object_details_component(frame_id: , ontology_id:, objects_title:, object:, &block)
     render TurboFrameComponent.new(id: frame_id, data: {"turbo-frame-target": "frame"}) do
-      return if !object.present?
-      return alert_component(object.errors.join) if object.errors
+      return unless object.present?
 
-      ontology_object_tabs_component(ontology_id: ontology_id, objects_title: objects_title, object_id: object["@id"]) do |tabs|
-        tab_item_component(container_tabs: tabs, title: t('concepts.details'), path: '#details', selected: true) do
-          capture(&block)
+      if object.errors
+        alert_component(object.errors.join)
+      else
+        ontology_object_tabs_component(ontology_id: ontology_id, objects_title: objects_title, object_id: object["@id"]) do |tabs|
+          tab_item_component(container_tabs: tabs, title: t('concepts.details'), path: '#details', selected: true) do
+            capture(&block)
+          end
         end
       end
     end
@@ -642,7 +645,7 @@ def ontology_depiction_card
 
   def count_subscriptions(ontology_id)
     ontology_id = ontology_id.split('/').last
-    users = LinkedData::Client::Models::User.all(include: 'subscription', display_context: false, display_links: false)
+    users = LinkedData::Client::Models::User.all(include: 'all', display_context: false, display_links: false)
     users.select { |u| u.subscription.find { |s| s.ontology && s.ontology.split('/').last.eql?(ontology_id) } }.count
   end
 
diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb
index 9d3019cd36..7eec737c73 100644
--- a/app/helpers/schemes_helper.rb
+++ b/app/helpers/schemes_helper.rb
@@ -1,4 +1,5 @@
 module SchemesHelper
+  include UrlsHelper
 
   def get_schemes(ontology)
     ontology.explore.schemes(language: request_lang)
@@ -47,8 +48,8 @@ def section_name(section)
     t("ontology_details.sections.#{section}")
   end
 
-  def scheme_path(scheme_id = '', language = '')
-    "/ontologies/#{@ontology.acronym}/schemes/show?id=#{escape(scheme_id)}&lang=#{language}"
+  def scheme_path(ontology_id: @ontology.acronym, scheme_id: '', language: request_lang)
+    "/ontologies/#{ontology_id}/schemes/show?id=#{escape(scheme_id)}&lang=#{language}"
   end
 
   def no_main_scheme?
@@ -64,6 +65,7 @@ def no_main_scheme_alert
       t('schemes.no_main_scheme_alert')
     end
   end
+
   def no_schemes_alert
     render Display::AlertComponent.new do
       t('schemes.no_schemes_alert', acronym: @ontology.acronym)
@@ -88,7 +90,6 @@ def schemes_tree(schemes_labels, main_scheme_label, selected_scheme_id, submissi
       scheme
     end.compact
 
-
     main_scheme = nil
     if main_scheme_label.nil?
       children = schemes
@@ -105,8 +106,8 @@ def schemes_tree(schemes_labels, main_scheme_label, selected_scheme_id, submissi
     root.children = children
     selected_scheme = selected_scheme || main_scheme || root.children.first
     tree_component(root, selected_scheme, target_frame: 'scheme', auto_click: false, submission: submission) do |child|
-      href = scheme_path(child['@id'], request_lang) rescue  ''
-      data = { schemeid: (child['@id'] rescue '')}
+      href = scheme_path(scheme_id: child['@id'], ontology_id: @ontology.acronym, language: request_lang)
+      data = { schemeid: child['@id']}
       ["#", data, href]
     end
   end
diff --git a/app/helpers/submission_inputs_helper.rb b/app/helpers/submission_inputs_helper.rb
index 06ecee5b39..2636fdc68e 100644
--- a/app/helpers/submission_inputs_helper.rb
+++ b/app/helpers/submission_inputs_helper.rb
@@ -108,12 +108,12 @@ def attribute_input(attr_key, long_text: false, label: nil, show_tooltip: true,
 
   end
 
-  def ontology_name_input(ontology = @ontology)
-    text_input(name: 'ontology[name]', value: ontology.name)
+  def ontology_name_input(ontology = @ontology, label: 'Name')
+    text_input(name: 'ontology[name]', value: ontology.name, label: label_required(label))
   end
 
-  def ontology_acronym_input(ontology = @ontology, update: @is_update_ontology)
-    out = text_input(name: 'ontology[acronym]', value: ontology.acronym, disabled: update)
+  def ontology_acronym_input(ontology = @ontology, update: @is_update_ontology, label: 'Acronym')
+    out = text_input(name: 'ontology[acronym]', value: ontology.acronym, disabled: update, label: label_required(label))
     out += hidden_field_tag('ontology[acronym]', ontology.acronym) if update
     out
   end
@@ -123,7 +123,7 @@ def ontology_administered_by_input(ontology = @ontology, users_list = @user_sele
       users_list = LinkedData::Client::Models::User.all(include: "username").map { |u| [u.username, u.id] }
       users_list.sort! { |a, b| a[1].downcase <=> b[1].downcase }
     end
-    select_input(label: t('submission_inputs.administrators'), name: "ontology[administeredBy]", values: users_list, selected: ontology.administeredBy || session[:user].id, multiple: true)
+    select_input(label: label_required(t('submission_inputs.administrators')), name: "ontology[administeredBy]", values: users_list, selected: ontology.administeredBy || session[:user].id, multiple: true)
   end
 
   def ontology_categories_input(ontology = @ontology, categories = @categories)
@@ -213,7 +213,7 @@ def ontology_visibility_input(ontology = @ontology)
 
     render(Layout::RevealComponent.new(possible_values: %w[private public], selected: ontology.viewingRestriction)) do |c|
       c.button do
-        select_input(label: t('submission_inputs.visibility'), name: "ontology[viewingRestriction]", required: true,
+        select_input(label: label_required(t('submission_inputs.visibility')), name: "ontology[viewingRestriction]", required: true,
                      values: %w[public private],
                      selected: ontology.viewingRestriction)
       end
@@ -248,7 +248,7 @@ def contact_input(label: '', name: t('submission_inputs.contact'), show_help: tr
 
       render NestedFormInputsComponent.new(object_name: 'contact', default_empty_row: true) do |c|
         c.header do
-          content_tag(:div, name.blank? ? '' : t('submission_inputs.contact_name', name: name), class: 'w-50') + content_tag(:div, name.blank? ? '' : t('submission_inputs.contact_email', name: name), class: 'w-50')
+          content_tag(:div, name.blank? ? '' : label_required(t('submission_inputs.contact_name', name: name)), class: 'w-50') + content_tag(:div, name.blank? ? '' : label_required(t('submission_inputs.contact_email', name: name)), class: 'w-50')
         end
 
         c.template do
@@ -531,4 +531,11 @@ def attribute_help_text(attr)
       help_text
     end
   end
+
+  def label_required(label)
+    content_tag(:div) do
+      label.html_safe +
+      content_tag(:span, '*', style: 'color: var(--error-color);')
+    end
+  end
 end
diff --git a/app/javascript/controllers/class_search_auto_complete_controller.js b/app/javascript/controllers/class_search_auto_complete_controller.js
index 831cfee410..0a42a8d343 100644
--- a/app/javascript/controllers/class_search_auto_complete_controller.js
+++ b/app/javascript/controllers/class_search_auto_complete_controller.js
@@ -11,14 +11,9 @@ export default class extends OntoportalAutocompleteController {
 
     onFindValue(li) {
         if (li == null) {
-            // User performs a search
-            let search = confirm("Class could not be found.\n\nPress OK to go to the Search page or Cancel to continue browsing");
-
-            if (search) {
-                jQuery("#search_keyword").val(jQuery("#search_box").val());
-                jQuery("#search_form").submit();
-                return
-            }
+            // No result found
+            // TODO in this case show a message to redirect to the global search page
+            return
         }
 
         // Appropriate value selected
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
index fa09b85416..7b99fc21d4 100644
--- a/app/javascript/controllers/index.js
+++ b/app/javascript/controllers/index.js
@@ -34,12 +34,6 @@ application.register("form-options-display", FormDisplayController)
 import HistoryController from "./history_controller"
 application.register("history", HistoryController)
 
-import LabelAjaxController from "./label_ajax_controller"
-application.register("label-ajax", LabelAjaxController)
-
-import LabelsAjaxContainerController from "./labels_ajax_container_controller"
-application.register("labels-ajax-container", LabelsAjaxContainerController)
-
 import LanguageChangeController from "./language_change_controller"
 application.register("language-change", LanguageChangeController)
 
diff --git a/app/javascript/controllers/label_ajax_controller.js b/app/javascript/controllers/label_ajax_controller.js
deleted file mode 100644
index d3cbcfff46..0000000000
--- a/app/javascript/controllers/label_ajax_controller.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import {Controller} from "@hotwired/stimulus"
-import useAjax from "../mixins/useAjax";
-
-// Connects to data-controller="label-ajax"
-export default class extends Controller {
-    static values = {
-        clsId: String,
-        ontologyAcronym: String,
-        ajaxUrl: String,
-        clsIdUrl: String,
-    }
-
-    connect() {
-        setTimeout(() => {
-            this.linkA = jQuery(this.element);
-
-            if (this.linkA.hasClass('ajax-modified-cls')) {
-                return true
-            }
-
-            this.cls_id = this.clsIdValue;
-            this.ont_acronym = this.ontologyAcronymValue;
-    
-            let ajax_uri = new URL(this.ajaxUrlValue, document.location.origin)
-    
-            ajax_uri.searchParams.set('ontology', this.ont_acronym)
-            ajax_uri.searchParams.set('id', this.cls_id)
-    
-    
-            this.request = useAjax({
-                url: ajax_uri.pathname + ajax_uri.search,
-                timeout: ajax_process_timeout * 1000,
-                success: this.#ajaxSuccess.bind(this),
-                error: this.#ajaxError.bind(this)
-            });
-          },1)
-    }
-
-    abort() {
-        if (this.request) {
-            this.request.abort()
-            this.request = null
-        }
-    }
-
-    disconnect() {
-        this.abort()
-    }
-
-    #ajaxSuccess(data) {
-        data = data.trim();
-        if (typeof data !== "undefined" && data.length > 0 && data.indexOf("http") !== 0) {
-            let cls_name = data
-            let cls_uri = this.clsIdUrlValue
-            this.linkA.html(cls_name);
-            this.linkA.attr('href', cls_uri);
-            this.linkA.addClass('ajax-modified-cls');
-            //find and process any identical classes (low probability)
-            this.#fillIdenticalIds(cls_name, cls_uri)
-        } else {
-            // remove the unique_id separator and the ontology acronym from the href
-            this.linkA.attr('href', this.cls_id);  // it may not be an ontology class, don't use the cls_uri
-            this.linkA.addClass('ajax-modified-cls');
-        }
-    }
-
-    #ajaxError() {
-        this.linkA.addClass('ajax-error')
-    }
-
-    #fillIdenticalIds(cls_name, cls_uri) {
-
-        let unique_id = this.linkA.attr('href');
-        jQuery('a[href="' + unique_id + '"]').each(function () {
-            let link = jQuery(this);
-            if (!link.hasClass('ajax-modified-cls')) {
-                link.html(cls_name);
-                link.attr('href', cls_uri);
-                link.addClass('ajax-modified-cls')
-            }
-        });
-    }
-}
diff --git a/app/javascript/controllers/labels_ajax_container_controller.js b/app/javascript/controllers/labels_ajax_container_controller.js
deleted file mode 100644
index a8f606114c..0000000000
--- a/app/javascript/controllers/labels_ajax_container_controller.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import {Controller} from "@hotwired/stimulus"
-
-// Connects to data-controller="labels-ajax-container"
-export default class extends Controller {
-    static outlets = ['label-ajax']
-
-    abortAll() {
-        this.labelAjaxOutlets.forEach((link) => {link.abort()})
-    }
-}
diff --git a/app/javascript/controllers/turbo_frame_error_controller.js b/app/javascript/controllers/turbo_frame_error_controller.js
index 782166bc54..16d2cbbd28 100644
--- a/app/javascript/controllers/turbo_frame_error_controller.js
+++ b/app/javascript/controllers/turbo_frame_error_controller.js
@@ -34,7 +34,10 @@ export default class extends Turbo_frame_controller {
     Array.from(styles).forEach(e => el.removeChild(e))
 
     let body = el.querySelector('h1')
-    this.errorMessageTarget.firstElementChild.querySelector('.alert-message').innerHTML =  (body ? body.innerText : el.innerHTML)
+    let alertContainer = this.errorMessageTarget.firstElementChild?.querySelector('.alert-message')
+    if(alertContainer){
+      alertContainer.innerHTML =  (body ? body.innerText : el.innerHTML)
+    }
     $(this.errorMessageTarget).show()
   }
 
diff --git a/app/views/collections/_list_view.html.haml b/app/views/collections/_list_view.html.haml
index a50abe0ce2..d0594f157f 100644
--- a/app/views/collections/_list_view.html.haml
+++ b/app/views/collections/_list_view.html.haml
@@ -11,6 +11,6 @@
           - scheme = OpenStruct.new(collection)
           - scheme.prefLabel = Array(get_collection_label(collection)).last
           - scheme.id = scheme['@id']
-          - tree_child.child(child: scheme, href: collection_path(collection['@id'], request_lang),
+          - tree_child.child(child: scheme, href: collection_path(collection_id: collection['@id'], ontology_id: @ontology.acronym, language: request_lang),
                            children_href: '#', selected: scheme.id.eql?(selected_collection_id),
                            target_frame: 'collection', data: {collectionid: collection['@id']}, is_reused: concept_reused?(submission: @submission, concept_id: scheme.id))
diff --git a/app/views/concepts/_list.html.haml b/app/views/concepts/_list.html.haml
index 9c9a28a848..45d56b6f41 100644
--- a/app/views/concepts/_list.html.haml
+++ b/app/views/concepts/_list.html.haml
@@ -10,6 +10,9 @@
       = render TreeLinkComponent.new(child: concept, href: href,
           children_href: '#', selected: concept.id.eql?(concepts.first.id) && c.auto_click?,
           target_frame: 'concept_show', data: data, is_reused: concept_reused?(submission: @submission, concept_id: concept.id))
-  - c.error do
-    = t('concepts.list_error')
 
+  - c.error do
+    - if @collection.nil?
+      = t("ontologies.concepts_browsers.select_collection")
+    - else
+      = t('concepts.list_error')
diff --git a/app/views/concepts/_request_term.html.haml b/app/views/concepts/_request_term.html.haml
deleted file mode 100644
index 85c364f60e..0000000000
--- a/app/views/concepts/_request_term.html.haml
+++ /dev/null
@@ -1,47 +0,0 @@
-:plain
-  <div id="trumbowyg-icons">
-    <svg xmlns="http://www.w3.org/2000/svg"><symbol id="trumbowyg-blockquote" viewBox="0 0 72 72"><path d="M21.3 31.9h-.6c.8-1.2 1.9-2.2 3.4-3.2 2.1-1.4 5-2.7 9.2-3.3l-1.4-8.9c-4.7.7-8.5 2.1-11.7 4-2.4 1.4-4.3 3.1-5.8 4.9-2.3 2.7-3.7 5.7-4.5 8.5-.8 2.8-1 5.4-1 7.5 0 2.3.3 4 .4 4.8 0 .1.1.3.1.4 1.2 5.4 6.1 9.5 11.9 9.5 6.7 0 12.2-5.4 12.2-12.2s-5.5-12-12.2-12zM49.5 31.9h-.6c.8-1.2 1.9-2.2 3.4-3.2 2.1-1.4 5-2.7 9.2-3.3l-1.4-8.9c-4.7.7-8.5 2.1-11.7 4-2.4 1.4-4.3 3.1-5.8 4.9-2.3 2.7-3.7 5.7-4.5 8.5-.8 2.8-1 5.4-1 7.5 0 2.3.3 4 .4 4.8 0 .1.1.3.1.4 1.2 5.4 6.1 9.5 11.9 9.5 6.7 0 12.2-5.4 12.2-12.2s-5.5-12-12.2-12z"/></symbol><symbol id="trumbowyg-bold" viewBox="0 0 72 72"><path d="M51.1 37.8c-1.1-1.4-2.5-2.5-4.2-3.3 1.2-.8 2.1-1.8 2.8-3 1-1.6 1.5-3.5 1.5-5.3 0-2-.6-4-1.7-5.8-1.1-1.8-2.8-3.2-4.8-4.1-2-.9-4.6-1.3-7.8-1.3h-16v42h16.3c2.6 0 4.8-.2 6.7-.7 1.9-.5 3.4-1.2 4.7-2.1 1.3-1 2.4-2.4 3.2-4.1.9-1.7 1.3-3.6 1.3-5.7.2-2.5-.5-4.7-2-6.6zM40.8 50.2c-.6.1-1.8.2-3.4.2h-9V38.5h8.3c2.5 0 4.4.2 5.6.6 1.2.4 2 1 2.7 2 .6.9 1 2 1 3.3 0 1.1-.2 2.1-.7 2.9-.5.9-1 1.5-1.7 1.9-.8.4-1.7.8-2.8 1zm2.6-20.4c-.5.7-1.3 1.3-2.5 1.6-.8.3-2.5.4-4.8.4h-7.7V21.6h7.1c1.4 0 2.6 0 3.6.1s1.7.2 2.2.4c1 .3 1.7.8 2.2 1.7.5.9.8 1.8.8 3-.1 1.3-.4 2.2-.9 3z"/></symbol><symbol id="trumbowyg-close" viewBox="0 0 72 72"><path d="M57 20.5l-5.4-5.4-15.5 15.5-15.6-15.5-5.4 5.4L30.7 36 15.1 51.5l5.4 5.4 15.6-15.5 15.5 15.5 5.4-5.4L41.5 36z"/></symbol><symbol id="trumbowyg-create-link" viewBox="0 0 72 72"><path d="M31.1 48.9l-6.7 6.7c-.8.8-1.6.9-2.1.9s-1.4-.1-2.1-.9L15 50.4c-1.1-1.1-1.1-3.1 0-4.2l6.1-6.1.2-.2 6.5-6.5c-1.2-.6-2.5-.9-3.8-.9-2.3 0-4.6.9-6.3 2.6L11 41.8c-3.5 3.5-3.5 9.2 0 12.7l5.2 5.2c1.7 1.7 4 2.6 6.3 2.6s4.6-.9 6.3-2.6l6.7-6.7c2.5-2.6 3.1-6.7 1.5-10l-5.9 5.9zM38.7 22.5l6.7-6.7c.8-.8 1.6-.9 2.1-.9s1.4.1 2.1.9l5.2 5.2c1.1 1.1 1.1 3.1 0 4.2l-6.1 6.1-.2.2L42 38c1.2.6 2.5.9 3.8.9 2.3 0 4.6-.9 6.3-2.6l6.7-6.7c3.5-3.5 3.5-9.2 0-12.7l-5.2-5.2c-1.7-1.7-4-2.6-6.3-2.6s-4.6.9-6.3 2.6l-6.7 6.7c-2.7 2.7-3.3 6.9-1.7 10.2l6.1-6.1c0 .1 0 .1 0 0z"/><path d="M44.2 30.5c.2-.2.4-.6.4-.9 0-.3-.1-.6-.4-.9l-2.3-2.3c-.3-.2-.6-.4-.9-.4-.3 0-.6.1-.9.4L25.9 40.6c-.2.2-.4.6-.4.9 0 .3.1.6.4.9l2.3 2.3c.2.2.6.4.9.4.3 0 .6-.1.9-.4l14.2-14.2zM49.9 55.4h-8.5v-5h8.5v-8.9h5.2v8.9h8.5v5h-8.5v8.9h-5.2v-8.9z"/></symbol><symbol id="trumbowyg-del" viewBox="0 0 72 72"><path d="M45.8 45c0 1-.3 1.9-.9 2.8-.6.9-1.6 1.6-3 2.1s-3.1.8-5 .8c-2.1 0-4-.4-5.7-1.1-1.7-.7-2.9-1.7-3.6-2.7-.8-1.1-1.3-2.6-1.5-4.5l-.1-.8-6.7.6v.9c.1 2.8.9 5.4 2.3 7.6 1.5 2.3 3.5 4 6.1 5.1 2.6 1.1 5.7 1.6 9.4 1.6 2.9 0 5.6-.5 8-1.6 2.4-1.1 4.3-2.7 5.6-4.7 1.3-2 2-4.2 2-6.5 0-1.6-.3-3.1-.9-4.5l-.2-.6H44c0 .1 1.8 2.3 1.8 5.5zM29 28.9c-.8-.8-1.2-1.7-1.2-2.9 0-.7.1-1.3.4-1.9.3-.6.7-1.1 1.4-1.6.6-.5 1.4-.9 2.5-1.1 1.1-.3 2.4-.4 3.9-.4 2.9 0 5 .6 6.3 1.7 1.3 1.1 2.1 2.7 2.4 5.1l.1.9 6.8-.5v-.9c-.1-2.5-.8-4.7-2.1-6.7s-3.2-3.5-5.6-4.5c-2.4-1-5.1-1.5-8.1-1.5-2.8 0-5.3.5-7.6 1.4-2.3 1-4.2 2.4-5.4 4.3-1.2 1.9-1.9 3.9-1.9 6.1 0 1.7.4 3.4 1.2 4.9l.3.5h11.8c-2.3-.9-3.9-1.7-5.2-2.9zm13.3-6.2zM22.7 20.3zM13 34.1h46.1v3.4H13z"/></symbol><symbol id="trumbowyg-em" viewBox="0 0 72 72"><path d="M26 57l10.1-42h7.2L33.2 57H26z"/></symbol><symbol id="trumbowyg-fullscreen" viewBox="0 0 72 72"><path d="M25.2 7.1H7.1v17.7l6.7-6.5 10.5 10.5 4.5-4.5-10.4-10.5zm22 0l6.5 6.7-10.5 10.5 4.5 4.5 10.5-10.4 6.7 6.8V7.1zm.5 36.1l-4.5 4.5 10.4 10.5-6.8 6.7h18.1V47.2l-6.7 6.5zm-23.4 0L13.8 53.6l-6.7-6.8v18.1h17.7l-6.5-6.7 10.5-10.5z"/><path fill="currentColor" d="M10.7 28.8h18.1V11.2l-6.6 6.4L11.6 7.1l-4.5 4.5 10.5 10.5zm50.1 0l-6.4-6.6 10.5-10.6-4.5-4.5-10.5 10.5-6.7-6.9v18.1zm-.4 36.1l4.5-4.5-10.5-10.5 6.9-6.7H43.2v17.6l6.6-6.4zm-48.8 0l10.5-10.5 6.7 6.9V43.2H11.1l6.5 6.6L7.1 60.4z"/></symbol><symbol id="trumbowyg-h1" viewBox="0 0 72 72"><path d="M6.4 14.9h7.4v16.7h19.1V14.9h7.4V57h-7.4V38H13.8v19H6.4V14.9zM47.8 22.5c1.4 0 2.8-.1 4.1-.4 1.3-.2 2.5-.6 3.6-1.2 1.1-.5 2-1.3 2.8-2.1.8-.9 1.3-1.9 1.5-3.2h5.5v41.2h-7.4v-29H47.8v-5.3z"/></symbol><symbol id="trumbowyg-h2" viewBox="0 0 72 72"><path d="M1.5 14.9h7.4v16.7H28V14.9h7.4V57H28V38H8.8v19H1.5V14.9zM70.2 56.9H42c0-3.4.9-6.4 2.5-9s3.8-4.8 6.6-6.7c1.3-1 2.7-1.9 4.2-2.9 1.5-.9 2.8-1.9 4-3 1.2-1.1 2.2-2.2 3-3.4.8-1.2 1.2-2.7 1.2-4.3 0-.7-.1-1.5-.3-2.4s-.5-1.6-1-2.4c-.5-.7-1.2-1.3-2.1-1.8-.9-.5-2.1-.7-3.5-.7-1.3 0-2.4.3-3.3.8s-1.6 1.3-2.1 2.2-.9 2-1.2 3.3c-.3 1.3-.4 2.6-.4 4.1h-6.7c0-2.3.3-4.4.9-6.3.6-1.9 1.5-3.6 2.7-5 1.2-1.4 2.7-2.5 4.4-3.3 1.7-.8 3.8-1.2 6.1-1.2 2.5 0 4.6.4 6.3 1.2 1.7.8 3.1 1.9 4.1 3.1 1 1.3 1.8 2.6 2.2 4.1.4 1.5.6 2.9.6 4.2 0 1.6-.3 3.1-.8 4.5-.5 1.3-1.2 2.6-2.1 3.7-.9 1.1-1.8 2.2-2.9 3.1-1.1.9-2.2 1.8-3.4 2.7-1.2.8-2.4 1.6-3.5 2.4-1.2.7-2.3 1.5-3.3 2.2-1 .7-1.9 1.5-2.6 2.3-.7.8-1.3 1.7-1.5 2.6h20.1v5.9z"/></symbol><symbol id="trumbowyg-h3" viewBox="0 0 72 72"><path d="M1.4 14.5h7.4v16.7h19.1V14.5h7.4v42.1h-7.4v-19H8.8v19H1.4V14.5zM53.1 32.4c1.1 0 2.2 0 3.3-.2 1.1-.2 2.1-.5 2.9-1 .9-.5 1.6-1.2 2.1-2 .5-.9.8-1.9.8-3.2 0-1.8-.6-3.2-1.8-4.2-1.2-1.1-2.7-1.6-4.6-1.6-1.2 0-2.2.2-3.1.7-.9.5-1.6 1.1-2.2 1.9-.6.8-1 1.7-1.3 2.7-.3 1-.4 2-.4 3.1h-6.7c.1-2 .5-3.9 1.1-5.6.7-1.7 1.6-3.2 2.7-4.4s2.6-2.2 4.2-2.9c1.6-.7 3.5-1.1 5.6-1.1 1.6 0 3.2.2 4.7.7 1.6.5 2.9 1.2 4.2 2.1 1.2.9 2.2 2.1 3 3.4.7 1.4 1.1 3 1.1 4.8 0 2.1-.5 3.9-1.4 5.4-.9 1.6-2.4 2.7-4.4 3.4v.1c2.4.5 4.2 1.6 5.5 3.5 1.3 1.9 2 4.1 2 6.8 0 2-.4 3.7-1.2 5.3-.8 1.6-1.8 2.9-3.2 3.9-1.3 1.1-2.9 1.9-4.7 2.5-1.8.6-3.6.9-5.6.9-2.4 0-4.5-.3-6.3-1s-3.3-1.7-4.5-2.9c-1.2-1.3-2.1-2.8-2.7-4.5-.6-1.8-1-3.7-1-5.9h6.7c-.1 2.5.5 4.6 1.9 6.3 1.3 1.7 3.3 2.5 5.9 2.5 2.2 0 4.1-.6 5.6-1.9 1.5-1.3 2.3-3.1 2.3-5.4 0-1.6-.3-2.9-.9-3.8-.6-.9-1.5-1.7-2.5-2.2-1-.5-2.2-.8-3.4-.9-1.3-.1-2.6-.2-3.9-.1v-5.2z"/></symbol><symbol id="trumbowyg-h4" viewBox="0 0 72 72"><path d="M1.5 14.9h7.4v16.7H28V14.9h7.4V57H28V38H8.9v19H1.5V14.9zM70.5 47.2h-5.3V57h-6.4v-9.8H41.2v-6.7l17.7-24.8h6.4v26.2h5.3v5.3zm-24.2-5.3h12.5V23.7h-.1L46.3 41.9z"/></symbol><symbol id="trumbowyg-h5" viewBox="0 0 72 72"><path d="M1.5 14.9h7.4v16.7H28V14.9h7.4V57H28V38H8.9v19H1.5V14.9zM69.043 42.368q0 5.655-3.92 10.154-3.856 4.434-9.383 4.434-6.105 0-9.768-2.892-3.599-2.891-3.728-8.033h6.62q0 2.892 1.735 4.37 1.735 1.478 4.691 1.478 3.085 0 5.142-2.57 2.056-2.57 2.056-6.748 0-8.869-6.426-8.869-4.692 0-7.327 5.463h-5.848l.9-24.292h22.75v5.398H50.02l-.643 12.21q3.02-3.599 8.355-3.599 5.205 0 8.226 3.985 3.084 3.92 3.084 9.511z"/></symbol><symbol id="trumbowyg-h6" viewBox="0 0 72 72"><path d="M1.5 14.9h7.4v16.7H28V14.9h7.4V57H28V38H8.9v19H1.5zM69.188 43.56q0 2.269-.63 4.475-.63 2.206-2.017 4.286t-4.097 3.403q-2.71 1.261-6.366 1.261-4.349 0-7.185-1.324-2.773-1.386-4.16-4.16-1.386-2.836-1.89-6.113t-.505-8.194q0-22.312 14.181-22.312 10.4 0 11.66 10.526h-6.177q-.378-5.61-5.483-5.61-2.521 0-4.223 1.766-1.702 1.701-2.458 4.538-.693 2.836-1.008 5.168-.252 2.269-.252 4.664 1.575-2.458 3.53-3.719 2.016-1.323 5.42-1.323 3.34 0 5.735 1.26 2.458 1.198 3.656 3.215 1.197 2.017 1.701 4.033.568 2.017.568 4.16zm-6.492.252q0-8.193-6.555-8.193-6.68 0-6.68 8.193 0 8.257 6.68 8.257 6.555 0 6.555-8.257z"/></symbol><symbol id="trumbowyg-horizontal-rule" viewBox="0 0 72 72"><path d="M9.1 32h54v8h-54z"/></symbol><symbol id="trumbowyg-insert-image" viewBox="0 0 72 72"><path d="M64 17v38H8V17h56m8-8H0v54h72V9z"/><path d="M17.5 22C15 22 13 24 13 26.5s2 4.5 4.5 4.5 4.5-2 4.5-4.5-2-4.5-4.5-4.5zM16 50h27L29.5 32zM36 36.2l8.9-8.5L60.2 50H45.9S35.6 35.9 36 36.2z"/></symbol><symbol id="trumbowyg-italic" viewBox="0 0 72 72"><path d="M26 57l10.1-42h7.2L33.2 57H26z"/></symbol><symbol id="trumbowyg-justify-center" viewBox="0 0 72 72"><path d="M9 14h54v8H9zM9 50h54v8H9zM18 32h36v8H18z"/></symbol><symbol id="trumbowyg-justify-full" viewBox="0 0 72 72"><path d="M9 14h54v8H9zM9 50h54v8H9zM9 32h54v8H9z"/></symbol><symbol id="trumbowyg-justify-left" viewBox="0 0 72 72"><path d="M9 14h54v8H9zM9 50h54v8H9zM9 32h36v8H9z"/></symbol><symbol id="trumbowyg-justify-right" viewBox="0 0 72 72"><path d="M9 14h54v8H9zM9 50h54v8H9zM27 32h36v8H27z"/></symbol><symbol id="trumbowyg-link" viewBox="0 0 72 72"><path d="M30.9 49.1l-6.7 6.7c-.8.8-1.6.9-2.1.9s-1.4-.1-2.1-.9l-5.2-5.2c-1.1-1.1-1.1-3.1 0-4.2l6.1-6.1.2-.2 6.5-6.5c-1.2-.6-2.5-.9-3.8-.9-2.3 0-4.6.9-6.3 2.6L10.8 42c-3.5 3.5-3.5 9.2 0 12.7l5.2 5.2c1.7 1.7 4 2.6 6.3 2.6s4.6-.9 6.3-2.6l6.7-6.7C38 50.5 38.6 46.3 37 43l-6.1 6.1zM38.5 22.7l6.7-6.7c.8-.8 1.6-.9 2.1-.9s1.4.1 2.1.9l5.2 5.2c1.1 1.1 1.1 3.1 0 4.2l-6.1 6.1-.2.2-6.5 6.5c1.2.6 2.5.9 3.8.9 2.3 0 4.6-.9 6.3-2.6l6.7-6.7c3.5-3.5 3.5-9.2 0-12.7l-5.2-5.2c-1.7-1.7-4-2.6-6.3-2.6s-4.6.9-6.3 2.6l-6.7 6.7c-2.7 2.7-3.3 6.9-1.7 10.2l6.1-6.1z"/><path d="M44.1 30.7c.2-.2.4-.6.4-.9 0-.3-.1-.6-.4-.9l-2.3-2.3c-.2-.2-.6-.4-.9-.4-.3 0-.6.1-.9.4L25.8 40.8c-.2.2-.4.6-.4.9 0 .3.1.6.4.9l2.3 2.3c.2.2.6.4.9.4.3 0 .6-.1.9-.4l14.2-14.2z"/></symbol><symbol id="trumbowyg-ordered-list" viewBox="0 0 72 72"><path d="M27 14h36v8H27zM27 50h36v8H27zM27 32h36v8H27zM11.8 15.8V22h1.8v-7.8h-1.5l-2.1 1 .3 1.3zM12.1 38.5l.7-.6c1.1-1 2.1-2.1 2.1-3.4 0-1.4-1-2.4-2.7-2.4-1.1 0-2 .4-2.6.8l.5 1.3c.4-.3 1-.6 1.7-.6.9 0 1.3.5 1.3 1.1 0 .9-.9 1.8-2.6 3.3l-1 .9V40H15v-1.5h-2.9zM13.3 53.9c1-.4 1.4-1 1.4-1.8 0-1.1-.9-1.9-2.6-1.9-1 0-1.9.3-2.4.6l.4 1.3c.3-.2 1-.5 1.6-.5.8 0 1.2.3 1.2.8 0 .7-.8.9-1.4.9h-.7v1.3h.7c.8 0 1.6.3 1.6 1.1 0 .6-.5 1-1.4 1-.7 0-1.5-.3-1.8-.5l-.4 1.4c.5.3 1.3.6 2.3.6 2 0 3.2-1 3.2-2.4 0-1.1-.8-1.8-1.7-1.9z"/></symbol><symbol id="trumbowyg-p" viewBox="0 0 72 72"><path d="M47.8 15.1H30.1c-4.7 0-8.5 3.7-8.5 8.4s3.7 8.4 8.4 8.4v25h7V19.8h3v37.1h4.1V19.8h3.7v-4.7z"/></symbol><symbol id="trumbowyg-redo" viewBox="0 0 72 72"><path d="M10.8 51.2c0-5.1 2.1-9.7 5.4-13.1 3.3-3.3 8-5.4 13.1-5.4H46v-12L61.3 36 45.9 51.3V39.1H29.3c-3.3 0-6.4 1.3-8.5 3.5-2.2 2.2-3.5 5.2-3.5 8.5h-6.5z"/></symbol><symbol id="trumbowyg-removeformat" viewBox="0 0 72 72"><path d="M58.2 54.6L52 48.5l3.6-3.6 6.1 6.1 6.4-6.4 3.8 3.8-6.4 6.4 6.1 6.1-3.6 3.6-6.1-6.1-6.4 6.4-3.7-3.8 6.4-6.4zM21.7 52.1H50V57H21.7zM18.8 15.2h34.1v6.4H39.5v24.2h-7.4V21.5H18.8v-6.3z"/></symbol><symbol id="trumbowyg-strikethrough" viewBox="0 0 72 72"><path d="M45.8 45c0 1-.3 1.9-.9 2.8-.6.9-1.6 1.6-3 2.1s-3.1.8-5 .8c-2.1 0-4-.4-5.7-1.1-1.7-.7-2.9-1.7-3.6-2.7-.8-1.1-1.3-2.6-1.5-4.5l-.1-.8-6.7.6v.9c.1 2.8.9 5.4 2.3 7.6 1.5 2.3 3.5 4 6.1 5.1 2.6 1.1 5.7 1.6 9.4 1.6 2.9 0 5.6-.5 8-1.6 2.4-1.1 4.3-2.7 5.6-4.7 1.3-2 2-4.2 2-6.5 0-1.6-.3-3.1-.9-4.5l-.2-.6H44c0 .1 1.8 2.3 1.8 5.5zM29 28.9c-.8-.8-1.2-1.7-1.2-2.9 0-.7.1-1.3.4-1.9.3-.6.7-1.1 1.4-1.6.6-.5 1.4-.9 2.5-1.1 1.1-.3 2.4-.4 3.9-.4 2.9 0 5 .6 6.3 1.7 1.3 1.1 2.1 2.7 2.4 5.1l.1.9 6.8-.5v-.9c-.1-2.5-.8-4.7-2.1-6.7s-3.2-3.5-5.6-4.5c-2.4-1-5.1-1.5-8.1-1.5-2.8 0-5.3.5-7.6 1.4-2.3 1-4.2 2.4-5.4 4.3-1.2 1.9-1.9 3.9-1.9 6.1 0 1.7.4 3.4 1.2 4.9l.3.5h11.8c-2.3-.9-3.9-1.7-5.2-2.9zm13.3-6.2zM22.7 20.3zM13 34.1h46.1v3.4H13z"/></symbol><symbol id="trumbowyg-strong" viewBox="0 0 72 72"><path d="M51.1 37.8c-1.1-1.4-2.5-2.5-4.2-3.3 1.2-.8 2.1-1.8 2.8-3 1-1.6 1.5-3.5 1.5-5.3 0-2-.6-4-1.7-5.8-1.1-1.8-2.8-3.2-4.8-4.1-2-.9-4.6-1.3-7.8-1.3h-16v42h16.3c2.6 0 4.8-.2 6.7-.7 1.9-.5 3.4-1.2 4.7-2.1 1.3-1 2.4-2.4 3.2-4.1.9-1.7 1.3-3.6 1.3-5.7.2-2.5-.5-4.7-2-6.6zM40.8 50.2c-.6.1-1.8.2-3.4.2h-9V38.5h8.3c2.5 0 4.4.2 5.6.6 1.2.4 2 1 2.7 2 .6.9 1 2 1 3.3 0 1.1-.2 2.1-.7 2.9-.5.9-1 1.5-1.7 1.9-.8.4-1.7.8-2.8 1zm2.6-20.4c-.5.7-1.3 1.3-2.5 1.6-.8.3-2.5.4-4.8.4h-7.7V21.6h7.1c1.4 0 2.6 0 3.6.1s1.7.2 2.2.4c1 .3 1.7.8 2.2 1.7.5.9.8 1.8.8 3-.1 1.3-.4 2.2-.9 3z"/></symbol><symbol id="trumbowyg-subscript" viewBox="0 0 72 72"><path d="M32 15h7.8L56 57.1h-7.9L44.3 46H27.4l-4 11.1h-7.6L32 15zm-2.5 25.4h12.9L36 22.3h-.2l-6.3 18.1zM58.7 59.9c.6-1.4 2-2.8 4.1-4.4 1.9-1.3 3.1-2.3 3.7-2.9.8-.9 1.3-1.9 1.3-3 0-.9-.2-1.6-.7-2.2-.5-.6-1.2-.9-2.1-.9-1.2 0-2.1.5-2.5 1.4-.3.5-.4 1.4-.5 2.5h-4c.1-1.8.4-3.2 1-4.3 1.1-2.1 3-3.1 5.8-3.1 2.2 0 3.9.6 5.2 1.8 1.3 1.2 1.9 2.8 1.9 4.8 0 1.5-.5 2.9-1.4 4.1-.6.8-1.6 1.7-3 2.6L66 57.7c-1 .7-1.7 1.2-2.1 1.6-.4.3-.7.7-1 1.1H72V64H57.8c0-1.5.3-2.8.9-4.1z"/></symbol><symbol id="trumbowyg-superscript" viewBox="0 0 72 72"><path d="M32 15h7.8L56 57.1h-7.9l-4-11.1H27.4l-4 11.1h-7.6L32 15zm-2.5 25.4h12.9L36 22.3h-.2l-6.3 18.1zM49.6 28.8c.5-1.1 1.6-2.3 3.4-3.6 1.5-1.1 2.5-1.9 3-2.4.7-.7 1-1.6 1-2.4 0-.7-.2-1.3-.6-1.8-.4-.5-1-.7-1.7-.7-1 0-1.7.4-2.1 1.1-.2.4-.3 1.1-.4 2.1H49c.1-1.5.3-2.6.8-3.5.9-1.7 2.5-2.6 4.8-2.6 1.8 0 3.2.5 4.3 1.5 1.1 1 1.6 2.3 1.6 4 0 1.3-.4 2.4-1.1 3.4-.5.7-1.3 1.4-2.4 2.2l-1.3 1c-.8.6-1.4 1-1.7 1.3-.3.3-.6.6-.8.9h7.4v3H48.8c0-1.3.3-2.4.8-3.5z"/></symbol><symbol id="trumbowyg-underline" viewBox="0 0 72 72"><path d="M36 35zM15.2 55.9h41.6V59H15.2zM21.1 13.9h6.4v21.2c0 1.2.1 2.5.2 3.7.1 1.3.5 2.4 1 3.4.6 1 1.4 1.8 2.6 2.5 1.1.6 2.7 1 4.8 1 2.1 0 3.7-.3 4.8-1 1.1-.6 2-1.5 2.6-2.5.6-1 .9-2.1 1-3.4.1-1.3.2-2.5.2-3.7V13.9H51v23.3c0 2.3-.4 4.4-1.1 6.1-.7 1.7-1.7 3.2-3 4.4-1.3 1.2-2.9 2-4.7 2.6-1.8.6-3.9.9-6.1.9-2.2 0-4.3-.3-6.1-.9-1.8-.6-3.4-1.5-4.7-2.6-1.3-1.2-2.3-2.6-3-4.4-.7-1.7-1.1-3.8-1.1-6.1V13.9z"/></symbol><symbol id="trumbowyg-undo" viewBox="0 0 72 72"><path d="M61.2 51.2c0-5.1-2.1-9.7-5.4-13.1-3.3-3.3-8-5.4-13.1-5.4H26.1v-12L10.8 36l15.3 15.3V39.1h16.7c3.3 0 6.4 1.3 8.5 3.5 2.2 2.2 3.5 5.2 3.5 8.5h6.4z"/></symbol><symbol id="trumbowyg-unlink" viewBox="0 0 72 72"><path d="M30.9 49.1l-6.7 6.7c-.8.8-1.6.9-2.1.9s-1.4-.1-2.1-.9l-5.2-5.2c-1.1-1.1-1.1-3.1 0-4.2l6.1-6.1.2-.2 6.5-6.5c-1.2-.6-2.5-.9-3.8-.9-2.3 0-4.6.9-6.3 2.6L10.8 42c-3.5 3.5-3.5 9.2 0 12.7l5.2 5.2c1.7 1.7 4 2.6 6.3 2.6s4.6-.9 6.3-2.6l6.7-6.7C38 50.5 38.6 46.3 37 43l-6.1 6.1zM38.5 22.7l6.7-6.7c.8-.8 1.6-.9 2.1-.9s1.4.1 2.1.9l5.2 5.2c1.1 1.1 1.1 3.1 0 4.2l-6.1 6.1-.2.2-6.5 6.5c1.2.6 2.5.9 3.8.9 2.3 0 4.6-.9 6.3-2.6l6.7-6.7c3.5-3.5 3.5-9.2 0-12.7l-5.2-5.2c-1.7-1.7-4-2.6-6.3-2.6s-4.6.9-6.3 2.6l-6.7 6.7c-2.7 2.7-3.3 6.9-1.7 10.2l6.1-6.1z"/><path d="M44.1 30.7c.2-.2.4-.6.4-.9 0-.3-.1-.6-.4-.9l-2.3-2.3c-.2-.2-.6-.4-.9-.4-.3 0-.6.1-.9.4L25.8 40.8c-.2.2-.4.6-.4.9 0 .3.1.6.4.9l2.3 2.3c.2.2.6.4.9.4.3 0 .6-.1.9-.4l14.2-14.2zM41.3 55.8v-5h22.2v5H41.3z"/></symbol><symbol id="trumbowyg-unordered-list" viewBox="0 0 72 72"><path d="M27 14h36v8H27zM27 50h36v8H27zM9 50h9v8H9zM9 32h9v8H9zM9 14h9v8H9zM27 32h36v8H27z"/></symbol><symbol id="trumbowyg-view-html" viewBox="0 0 72 72"><path fill="none" stroke="currentColor" stroke-width="8" stroke-miterlimit="10" d="M26.9 17.9L9 36.2 26.9 54M45 54l17.9-18.3L45 17.9"/></symbol><symbol id="trumbowyg-back-color" viewBox="0 0 72 72"><path d="M36.5 22.3l-6.3 18.1H43l-6.3-18.1z"/><path d="M9 8.9v54.2h54.1V8.9H9zm39.9 48.2L45 46H28.2l-3.9 11.1h-7.6L32.8 15h7.8l16.2 42.1h-7.9z"/></symbol><symbol id="trumbowyg-fore-color" viewBox="0 0 72 72"><path d="M32 15h7.8L56 57.1h-7.9l-4-11.1H27.4l-4 11.1h-7.6L32 15zm-2.5 25.4h12.9L36 22.3h-.2l-6.3 18.1z"/></symbol><symbol id="trumbowyg-base64" viewBox="0 0 72 72"><path d="M64 17v38H8V17h56m8-8H0v54h72V9z"/><path d="M29.9 28.9c-.5-.5-1.1-.8-1.8-.8s-1.4.2-1.9.7c-.5.4-.9 1-1.2 1.6-.3.6-.5 1.3-.6 2.1-.1.7-.2 1.4-.2 1.9l.1.1c.6-.8 1.2-1.4 2-1.8.8-.4 1.7-.5 2.7-.5.9 0 1.8.2 2.6.6.8.4 1.6.9 2.2 1.5.6.6 1 1.3 1.2 2.2.3.8.4 1.6.4 2.5 0 1.1-.2 2.1-.5 3-.3.9-.8 1.7-1.5 2.4-.6.7-1.4 1.2-2.3 1.6-.9.4-1.9.6-3 .6-1.6 0-2.8-.3-3.9-.9-1-.6-1.8-1.4-2.5-2.4-.6-1-1-2.1-1.3-3.4-.2-1.3-.4-2.6-.4-3.9 0-1.3.1-2.6.4-3.8.3-1.3.8-2.4 1.4-3.5.7-1 1.5-1.9 2.5-2.5 1-.6 2.3-1 3.8-1 .9 0 1.7.1 2.5.4.8.3 1.4.6 2 1.1.6.5 1.1 1.1 1.4 1.8.4.7.6 1.5.7 2.5h-4c0-1-.3-1.6-.8-2.1zm-3.5 6.8c-.4.2-.8.5-1 .8-.3.4-.5.8-.6 1.2-.1.5-.2 1-.2 1.5s.1.9.2 1.4c.1.5.4.9.6 1.2.3.4.6.7 1 .9.4.2.9.3 1.4.3.5 0 1-.1 1.3-.3.4-.2.7-.5 1-.9.3-.4.5-.8.6-1.2.1-.5.2-.9.2-1.4 0-.5-.1-1-.2-1.4-.1-.5-.3-.9-.6-1.2-.3-.4-.6-.7-1-.9-.4-.2-.9-.3-1.4-.3-.4 0-.9.1-1.3.3zM36.3 41.3v-3.8l9-12.1H49v12.4h2.7v3.5H49v4.8h-4v-4.8h-8.7zM45 30.7l-5.3 7.2h5.4l-.1-7.2z"/></symbol><symbol id="trumbowyg-emoji" viewBox="0 0 72 72"><path d="M36.05 9C21.09 9 8.949 21.141 8.949 36.101c0 14.96 12.141 27.101 27.101 27.101 14.96 0 27.101-12.141 27.101-27.101S51.01 9 36.05 9zm9.757 15.095c2.651 0 4.418 1.767 4.418 4.418s-1.767 4.418-4.418 4.418-4.418-1.767-4.418-4.418 1.767-4.418 4.418-4.418zm-19.479 0c2.651 0 4.418 1.767 4.418 4.418s-1.767 4.418-4.418 4.418-4.418-1.767-4.418-4.418 1.767-4.418 4.418-4.418zm9.722 30.436c-14.093 0-16.261-13.009-16.261-13.009h32.522S50.143 54.531 36.05 54.531z"/></symbol><symbol id="trumbowyg-fontsize" viewBox="0 0 24 24"><path d="M9 4v3h5v12h3V7h5V4H9zm-6 8h3v7h3v-7h3V9H3v3z"/></symbol><symbol id="trumbowyg-giphy" viewBox="0 0 72 72"><g fill-rule="nonzero"><path d="M15.676 40.149v-5.282h13.645v12.489c-1.326 1.283-3.248 2.413-5.764 3.39-2.516.977-5.065 1.465-7.646 1.465-3.279 0-6.137-.688-8.575-2.064-2.439-1.376-4.271-3.343-5.497-5.903C.613 41.685 0 38.901 0 35.893c0-3.265.684-6.166 2.053-8.704 1.369-2.538 3.372-4.484 6.01-5.839 2.01-1.04 4.512-1.561 7.506-1.561 3.893 0 6.933.816 9.122 2.449 2.188 1.632 3.596 3.889 4.223 6.769l-6.287 1.176c-.442-1.54-1.273-2.755-2.492-3.646-1.219-.892-2.741-1.337-4.566-1.337-2.766 0-4.965.877-6.597 2.63-1.633 1.754-2.449 4.356-2.449 7.806 0 3.722.827 6.513 2.481 8.373 1.654 1.861 3.821 2.791 6.501 2.791 1.326 0 2.656-.26 3.989-.781 1.333-.52 2.477-1.151 3.432-1.892v-3.978h-7.25zM36.568 20.324h6.33v31.352h-6.33zM50.507 51.676V20.324H72v5.304H56.837v7.421h13.089v5.303H56.837v13.324h-6.33z"/></g></symbol><symbol id="trumbowyg-highlight" viewBox="0 0 60 60"><path d="M11 7c0-2.206-1.794-4-4-4S3 4.794 3 7s1.794 4 4 4 4-1.794 4-4zM7 9c-1.103 0-2-.897-2-2s.897-2 2-2 2 .897 2 2-.897 2-2 2zM16 11c2.206 0 4-1.794 4-4s-1.794-4-4-4-4 1.794-4 4 1.794 4 4 4zm0-6c1.103 0 2 .897 2 2s-.897 2-2 2-2-.897-2-2 .897-2 2-2zM25 11c2.206 0 4-1.794 4-4s-1.794-4-4-4-4 1.794-4 4 1.794 4 4 4zm0-6c1.103 0 2 .897 2 2s-.897 2-2 2-2-.897-2-2 .897-2 2-2z"/><path d="M0 0v60h60V0H0zm2 2h56v10H2V2zm0 56V14h5v44H2zm56 0H9V14h49v44z"/><path d="M5 17H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 21H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 25H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 29H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 33H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 37H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 41H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 45H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 49H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM5 53H4a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2zM13 19h13a1 1 0 1 0 0-2H13a1 1 0 1 0 0 2zM30 19h10a1 1 0 1 0 0-2H30a1 1 0 1 0 0 2zM44 19h2a1 1 0 1 0 0-2h-2a1 1 0 1 0 0 2zM35 22a1 1 0 0 0 1 1h15a1 1 0 1 0 0-2H36a1 1 0 0 0-1 1zM32 21H18a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2zM13 23h1a1 1 0 1 0 0-2h-1a1 1 0 1 0 0 2zM13 27h9a1 1 0 1 0 0-2h-9a1 1 0 1 0 0 2zM26 27h2a1 1 0 1 0 0-2h-2a1 1 0 1 0 0 2zM46 25H32a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2zM13 31h13a1 1 0 1 0 0-2H13a1 1 0 1 0 0 2zM41 30a1 1 0 0 0-1-1H30a1 1 0 1 0 0 2h10a1 1 0 0 0 1-1zM36 35h8a1 1 0 1 0 0-2h-8a1 1 0 1 0 0 2zM17 34a1 1 0 0 0 1 1h14a1 1 0 1 0 0-2H18a1 1 0 0 0-1 1zM13 35h1a1 1 0 1 0 0-2h-1a1 1 0 1 0 0 2zM13 39h9a1 1 0 1 0 0-2h-9a1 1 0 1 0 0 2zM26 39h2a1 1 0 1 0 0-2h-2a1 1 0 1 0 0 2zM31 38a1 1 0 0 0 1 1h15a1 1 0 1 0 0-2H32a1 1 0 0 0-1 1zM13 43h13a1 1 0 1 0 0-2H13a1 1 0 1 0 0 2zM40 41H30a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2zM51 41h-7a1 1 0 1 0 0 2h7a1 1 0 1 0 0-2zM40 45h-4a1 1 0 1 0 0 2h4a1 1 0 1 0 0-2zM17 46a1 1 0 0 0 1 1h14a1 1 0 1 0 0-2H18a1 1 0 0 0-1 1zM13 47h1a1 1 0 1 0 0-2h-1a1 1 0 1 0 0 2zM22 49h-9a1 1 0 1 0 0 2h9a1 1 0 1 0 0-2zM28 49h-2a1 1 0 1 0 0 2h2a1 1 0 1 0 0-2zM39 49h-7a1 1 0 1 0 0 2h7a1 1 0 1 0 0-2zM44 49h-1a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2z"/></symbol><symbol id="trumbowyg-insert-audio" viewBox="-2 -2 12 12"><path d="M3.344 0L2 2H0v4h2l1.344 2H4V0h-.656zM5 1v1c.152 0 .313.026.469.063H5.5c.86.215 1.5.995 1.5 1.938a1.99 1.99 0 0 1-2 2.001v1a2.988 2.988 0 0 0 3-3 2.988 2.988 0 0 0-3-3zm0 2v2l.25-.031C5.683 4.851 6 4.462 6 4c0-.446-.325-.819-.75-.938v-.031h-.031L5 3z"/></symbol><symbol id="trumbowyg-lineheight" viewBox="0 0 72 72"><path fill="currentColor" d="M31 14h36v8H31zm0 36h36v8H31zm0-18h30v8H31z"/><path fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="3.643" d="M7.82 47.207l8.332 8.15 8.106-8.15m.018-22.572l-8.333-8.15-8.105 8.15"/><path fill="currentColor" d="M14.348 53.761v-36h3.384v36z"/></symbol><symbol id="trumbowyg-mention" viewBox="0 0 128 128"><path fill-rule="evenodd" d="M73.309 62.5c-1.53 9.86-8.16 17.85-14.45 17.85-5.61 0-8.5-4.08-8.5-10.54 0-13.089 8.84-24.139 20.06-24.139 2.21 0 3.91.34 5.27.68L73.309 62.5zm14.45 44.2c-6.8 3.57-15.98 5.44-24.65 5.44-25.329 0-43.519-16.15-43.519-44.54 0-32.469 22.78-52.869 48.789-52.869 26.35 0 40.63 17.17 40.63 39.27 0 19.549-9.18 28.899-16.49 28.729-4.76-.17-5.95-4.76-4.25-14.79l5.1-31.449c-4.25-2.38-12.75-4.25-20.23-4.25-24.48 0-39.779 18.87-39.779 39.609 0 13.94 7.99 22.1 19.039 22.1 9.01 0 16.66-4.42 21.93-13.09h.34c.85 9.01 6.63 13.09 14.62 13.09 18.36 0 32.3-15.64 32.3-40.459 0-28.56-21.42-49.13-51.34-49.13C31.83 4.361 6.67 34.451 6.67 69.13c0 33.32 24.82 53.55 53.039 53.55 12.07 0 20.91-1.53 31.11-6.12l-3.06-9.86z"/></symbol><symbol id="trumbowyg-mathml" viewBox="0 0 445.878 445.878"><path d="M426.024 86.447H209.705l-84.911 298.911c-2.568 7.967-9.854 13.482-18.22 13.771-.236 0-.464.006-.688.006a19.868 19.868 0 0 1-18.436-12.478l-34.714-86.782H19.851C8.884 299.876 0 290.986 0 280.022c0-10.965 8.893-19.854 19.851-19.854H66.18a19.862 19.862 0 0 1 18.436 12.483l19.237 48.09 72.472-260.218a19.855 19.855 0 0 1 18.903-13.781h230.798c10.97 0 19.854 8.89 19.854 19.851s-8.892 19.854-19.856 19.854zm10.699 266.78l-78.259-87.904 74.576-82.783c1.318-1.454 1.638-3.547.857-5.341a4.977 4.977 0 0 0-4.54-2.946h-47.18a4.995 4.995 0 0 0-3.759 1.72l-50.059 58.047-49.674-58.029a4.95 4.95 0 0 0-3.771-1.738H225.58a4.947 4.947 0 0 0-4.521 2.929 4.939 4.939 0 0 0 .824 5.332l73.743 82.81-77.641 87.923a4.977 4.977 0 0 0-.813 5.325 4.978 4.978 0 0 0 4.528 2.92h48.9c1.472 0 2.867-.65 3.807-1.785l51.819-62.181 53.05 62.229a4.972 4.972 0 0 0 3.782 1.743h49.97a4.938 4.938 0 0 0 4.527-2.926 4.966 4.966 0 0 0-.832-5.345z"/></symbol><symbol id="trumbowyg-noembed" viewBox="0 0 72 72"><path d="M31.5 33.6V25l11 11-11 11v-8.8z"/><path d="M64 17v38H8V17h56m8-8H0v54h72V9z"/></symbol><symbol id="trumbowyg-preformatted" viewBox="0 0 72 72"><path d="M10.3 33.5c.4 0 .9-.1 1.5-.2s1.2-.3 1.8-.7c.6-.3 1.1-.8 1.5-1.3.4-.5.6-1.3.6-2.1V17.1c0-1.4.3-2.6.8-3.6s1.2-1.9 2-2.5c.8-.7 1.6-1.2 2.5-1.5.9-.3 1.6-.5 2.2-.5h5.3v5.3h-3.2c-.7 0-1.3.1-1.8.4-.4.3-.8.6-1 1-.2.4-.4.9-.4 1.3-.1.5-.1.9-.1 1.4v11.4c0 1.2-.2 2.1-.7 2.9-.5.8-1 1.4-1.7 1.8-.6.4-1.3.8-2 1-.7.2-1.3.3-1.7.4v.1c.5 0 1 .1 1.7.3.7.2 1.3.5 2 .9.6.5 1.2 1.1 1.7 1.9.5.8.7 2 .7 3.4v11.1c0 .4 0 .9.1 1.4.1.5.2.9.4 1.3s.6.7 1 1c.4.3 1 .4 1.8.4h3.2V63h-5.3c-.6 0-1.4-.2-2.2-.5-.9-.3-1.7-.8-2.5-1.5s-1.4-1.5-2-2.5c-.5-1-.8-2.2-.8-3.6V43.5c0-.9-.2-1.7-.6-2.3-.4-.6-.9-1.1-1.5-1.5-.6-.4-1.2-.6-1.8-.7-.6-.1-1.1-.2-1.5-.2v-5.3zM61.8 38.7c-.4 0-1 .1-1.6.2-.6.1-1.2.4-1.8.7-.6.3-1.1.7-1.5 1.3-.4.5-.6 1.3-.6 2.1v12.1c0 1.4-.3 2.6-.8 3.6s-1.2 1.9-2 2.5c-.8.7-1.6 1.2-2.5 1.5-.9.3-1.6.5-2.2.5h-5.3v-5.3h3.2c.7 0 1.3-.1 1.8-.4.4-.3.8-.6 1-1 .2-.4.4-.9.4-1.3.1-.5.1-.9.1-1.4V42.3c0-1.2.2-2.1.7-2.9.5-.8 1-1.4 1.7-1.8.6-.4 1.3-.8 2-1 .7-.2 1.3-.3 1.7-.4v-.1c-.5 0-1-.1-1.7-.3-.7-.2-1.3-.5-2-.9-.6-.4-1.2-1.1-1.7-1.9-.5-.8-.7-2-.7-3.4V18.5c0-.4 0-.9-.1-1.4-.1-.5-.2-.9-.4-1.3s-.6-.7-1-1c-.4-.3-1-.4-1.8-.4h-3.2V9.1h5.3c.6 0 1.4.2 2.2.5.9.3 1.7.8 2.5 1.5s1.4 1.5 2 2.5c.5 1 .8 2.2.8 3.6v11.6c0 .9.2 1.7.6 2.3.4.6.9 1.1 1.5 1.5.6.4 1.2.6 1.8.7.6.1 1.2.2 1.6.2v5.2z"/></symbol><symbol id="trumbowyg-ruby" viewBox="0 0 72 72"><path d="M16.499 24.477h8.018L41.08 67.5H33l-4.04-11.361H11.804L7.764 67.5H0l16.499-43.023zm-2.65 25.907h13.127l-6.438-18.497h-.177l-6.512 18.497zM65.053 16.685c-6.316 1.178-12.025 1.98-17.126 2.408a362.385 362.385 0 0 0-.965 5.833c-.25 1.57-.679 3.907-1.286 7.013 3.033-1.963 5.852-3.266 8.458-3.907 2.639-.642 4.905-.891 6.797-.75 1.891.108 3.746.661 5.566 1.661 1.82.964 3.264 2.408 4.334 4.334 1.104 1.893 1.427 4.088.965 6.584-.466 2.461-1.554 4.494-3.265 6.101-1.679 1.605-3.658 2.783-5.941 3.532-2.283.785-4.853 1.251-7.707 1.391-2.819.144-5.906.161-9.259.056 0-1.642-.287-3.212-.857-4.71l.108-.59c2.711.5 5.246.768 7.601.802 2.39 0 4.529-.195 6.421-.589 1.927-.393 3.605-1.069 5.031-2.031 1.427-.965 2.319-2.319 2.676-4.067.394-1.75.269-3.229-.373-4.443-.644-1.249-1.446-2.213-2.408-2.891-.929-.68-2.161-1.034-3.693-1.071-1.536-.072-3.265.089-5.192.482-1.927.391-3.82 1.14-5.672 2.248a24.308 24.308 0 0 0-4.978 3.907l-4.872-1.981c1.463-5.031 2.355-8.597 2.677-10.703.321-2.105.642-4.067.963-5.887-3.961.25-7.154.411-9.58.481-.215-1.927-.52-3.534-.91-4.817l.32-.32c3.604.32 7.225.446 10.865.375.214-1.355.481-3.103.804-5.245.354-2.175.407-3.621.16-4.336.034-.784.374-1.017 1.017-.695l5.085.749c.428.251.444.573.055.964l-.857.91c-.537 2.89-.981 5.352-1.338 7.385 4.279-.427 9.312-1.393 15.092-2.89l1.284 4.707"/></symbol><symbol id="trumbowyg-col-delete" viewBox="0 0 24 24"><g transform="translate(-326 -532.36)"><rect width="6" height="15" x="335" y="537.36" fill="#ed5565" stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width=".837" rx=".646"/><path d="M347.58 536.498c-.051-.618-.55-1.138-1.178-1.138H329.6c-.628 0-1.127.52-1.18 1.138h-.02v15.663a1.2 1.2 0 0 0 1.2 1.2h16.801a1.2 1.2 0 0 0 1.2-1.2v-15.663h-.021M334.4 552.16h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6m6 9.601h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6m6.001 9.601h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6"/></g></symbol><symbol id="trumbowyg-col-left" viewBox="0 0 24 24"><g transform="translate(-326 -532.36)"><rect width="6" height="15" x="329" y="537.36" fill="#1ab394" stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width=".837" rx=".646"/><path d="M347.58 536.498c-.051-.618-.55-1.138-1.178-1.138H329.6c-.628 0-1.127.52-1.18 1.138h-.02v15.663a1.2 1.2 0 0 0 1.2 1.2h16.801a1.2 1.2 0 0 0 1.2-1.2v-15.663h-.021M334.4 552.16h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6m6 9.601h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6m6.001 9.601h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6"/></g></symbol><symbol id="trumbowyg-col-right" viewBox="0 0 24 24"><g transform="matrix(-1 0 0 1 350 -532.36)"><rect y="537.36" x="329" height="15" width="6" fill="#1ab394" stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width=".837" rx=".646"/><path d="M347.58 536.498c-.051-.618-.55-1.138-1.178-1.138H329.6c-.628 0-1.127.52-1.18 1.138h-.02v15.663a1.2 1.2 0 0 0 1.2 1.2h16.801a1.2 1.2 0 0 0 1.2-1.2v-15.663h-.021M334.4 552.16h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6m6 9.601h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6m6.001 9.601h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8v-3.601h4.8v3.6"/></g></symbol><symbol id="trumbowyg-row-above" viewBox="0 0 24 24"><rect y="-347" x="537.06" height="18" width="6" transform="matrix(0 1 1 0 350 -532.36)" fill="#1ab394" stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width=".917" rx=".776"/><path d="M2.42 4.138C2.47 3.52 2.97 3 3.598 3H20.4c.628 0 1.127.52 1.18 1.138h.02V19.8a1.2 1.2 0 0 1-1.2 1.2H3.599a1.2 1.2 0 0 1-1.2-1.2V4.138h.021M15.6 19.8h4.8v-3.6h-4.8v3.6m0-4.7h4.8v-3.7h-4.8v3.7m0-4.9h4.8V6.6h-4.8v3.6m-6 9.601h4.8v-3.6H9.6v3.6m0-4.7h4.8v-3.7H9.6v3.7m0-4.9h4.8V6.6H9.6v3.6m-6.001 9.601h4.8v-3.6H3.6v3.6m0-4.7h4.8v-3.7H3.6v3.7m0-4.9h4.8V6.6H3.6v3.6"/></symbol><symbol id="trumbowyg-row-below" viewBox="0 0 24 24"><rect y="-347.06" x="548.4" height="18.13" width="4.427" transform="matrix(0 1 1 0 350 -532.36)" fill="#1ab394" stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width=".79" rx=".781"/><path d="M2.42 4.138C2.47 3.52 2.97 3 3.598 3H20.4c.628 0 1.127.52 1.18 1.138h.02V19.8a1.2 1.2 0 0 1-1.2 1.2H3.599a1.2 1.2 0 0 1-1.2-1.2V4.138h.021M15.6 19.8h4.8v-3.6h-4.8v3.6m0-4.7h4.8v-3.7h-4.8v3.7m0-4.9h4.8V6.6h-4.8v3.6m-6 9.601h4.8v-3.6H9.6v3.6m0-4.7h4.8v-3.7H9.6v3.7m0-4.9h4.8V6.6H9.6v3.6m-6.001 9.601h4.8v-3.6H3.6v3.6m0-4.7h4.8v-3.7H3.6v3.7m0-4.9h4.8V6.6H3.6v3.6"/></symbol><symbol id="trumbowyg-row-delete" viewBox="0 0 24 24"><rect width="5" height="18" x="543.36" y="-347" transform="rotate(90 103.18 -429.18)" fill="#ed5565" rx=".776"/><path d="M21.58 4.136c-.051-.618-.55-1.138-1.178-1.138H3.6c-.628 0-1.127.52-1.18 1.138H2.4v15.663A1.2 1.2 0 0 0 3.6 21h16.801a1.2 1.2 0 0 0 1.2-1.2V4.136h-.021M8.4 19.799H3.6v-3.6h4.8v3.6m0-4.7H3.6v-3.7h4.8v3.7m0-4.9H3.6V6.597h4.8v3.6m6 9.601H9.6v-3.6h4.8v3.6m0-4.7H9.6v-3.7h4.8v3.7m0-4.9H9.6V6.597h4.8v3.6m6.001 9.601h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8V6.597h4.8v3.6"/></symbol><symbol id="trumbowyg-table-delete" viewBox="0 0 24 24"><rect y="-347" x="537.06" height="18" width="6" transform="matrix(0 1 1 0 350 -532.36)" fill="#ed5565" stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width=".917" rx=".776"/><rect width="5" height="18" x="543.36" y="-347" transform="rotate(90 103.18 -429.18)" fill="#ed5565" rx=".776"/><rect y="-347.06" x="548.4" height="18.13" width="4.427" transform="matrix(0 1 1 0 350 -532.36)" fill="#ed5565" stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width=".79" rx=".781"/><path d="M21.58 4.136c-.051-.618-.55-1.138-1.178-1.138H3.6c-.628 0-1.127.52-1.18 1.138H2.4v15.663A1.2 1.2 0 0 0 3.6 21h16.801a1.2 1.2 0 0 0 1.2-1.2V4.136h-.021M8.4 19.799H3.6v-3.6h4.8v3.6m0-4.7H3.6v-3.7h4.8v3.7m0-4.9H3.6V6.597h4.8v3.6m6 9.601H9.6v-3.6h4.8v3.6m0-4.7H9.6v-3.7h4.8v3.7m0-4.9H9.6V6.597h4.8v3.6m6.001 9.601h-4.8v-3.6h4.8v3.6m0-4.7h-4.8v-3.7h4.8v3.7m0-4.9h-4.8V6.597h4.8v3.6"/></symbol><symbol id="trumbowyg-table" viewBox="0 0 72 72"><path d="M25.686 51.38v-6.347q0-.462-.297-.76-.298-.297-.761-.297H14.04q-.463 0-.761.297-.298.298-.298.76v6.346q0 .463.298.76.298.298.76.298h10.589q.463 0 .76-.298.298-.297.298-.76zm0-12.692v-6.346q0-.463-.297-.76-.298-.298-.761-.298H14.04q-.463 0-.761.298-.298.297-.298.76v6.346q0 .462.298.76.298.297.76.297h10.589q.463 0 .76-.297.298-.298.298-.76zm16.94 12.691v-6.346q0-.462-.297-.76-.298-.297-.761-.297H30.98q-.463 0-.76.297-.299.298-.299.76v6.346q0 .463.298.76.298.298.761.298h10.588q.463 0 .76-.298.299-.297.299-.76zm-16.94-25.383v-6.345q0-.463-.297-.76-.298-.298-.761-.298H14.04q-.463 0-.761.297-.298.298-.298.76v6.346q0 .463.298.76.298.298.76.298h10.589q.463 0 .76-.298.298-.297.298-.76zm16.94 12.692v-6.346q0-.463-.297-.76-.298-.298-.761-.298H30.98q-.463 0-.76.298-.299.297-.299.76v6.346q0 .462.298.76.298.297.761.297h10.588q.463 0 .76-.297.299-.298.299-.76zm16.94 12.691v-6.346q0-.462-.297-.76-.298-.297-.76-.297H47.92q-.463 0-.76.297-.298.298-.298.76v6.346q0 .463.297.76.298.298.761.298h10.588q.463 0 .761-.298.298-.297.298-.76zm-16.94-25.383v-6.345q0-.463-.297-.76-.298-.298-.761-.298H30.98q-.463 0-.76.297-.299.298-.299.76v6.346q0 .463.298.76.298.298.761.298h10.588q.463 0 .76-.298.299-.297.299-.76zm16.94 12.692v-6.346q0-.463-.297-.76-.298-.298-.76-.298H47.92q-.463 0-.76.298-.298.297-.298.76v6.346q0 .462.297.76.298.297.761.297h10.588q.463 0 .761-.297.298-.298.298-.76zm0-12.692v-6.345q0-.463-.297-.76-.298-.298-.76-.298H47.92q-.463 0-.76.297-.298.298-.298.76v6.346q0 .463.297.76.298.298.761.298h10.588q.463 0 .761-.298.298-.297.298-.76zm4.236-10.576v35.96q0 2.18-1.555 3.734-1.555 1.553-3.739 1.553H14.04q-2.184 0-3.739-1.553-1.555-1.553-1.555-3.735V15.42q0-2.181 1.555-3.735 1.555-1.553 3.739-1.553h44.468q2.184 0 3.739 1.553 1.555 1.554 1.555 3.735z"/></symbol><symbol id="trumbowyg-special-chars" viewBox="0 0 72 72"><text style="text-align:start;line-height:125%" x="6.03" y="48.528" transform="scale(1.0117 .98844)" font-size="60.056" font-weight="400" font-family="Times New Roman"><tspan x="6.03" y="48.528">&#x2122;</tspan></text></symbol><symbol id="trumbowyg-upload" viewBox="0 0 72 72"><path d="M64 27v28H8V27H0v36h72V27h-8z"/><path d="M32.1 6.7h8v33.6h-8z"/><path d="M48 35.9L36 49.6 24 36h24z"/></symbol></svg>
-  </div>
-.notes_list_container
-  .add_request_term{style: "float: left; margin-right: 1em;"}
-    %div#ob_success_message{class: "message-box success-msg", style: "display: none; margin: 10px 0;"}
-    %div#ob_error_message{class: "message-box error-msg", style: "display: none; margin: 10px 0;"}
-    - if !session[:user].nil? && @ontology.admin?(session[:user])
-      %p
-        %em
-          = t('concepts.request_terms_instructions', acronym: @ontology.acronym)
-      %div#new_term_instructions_container{style: 'clear: both;'}
-        %form#new_term_instructions_form
-          = hidden_field nil, :acronym, value: @ontology.acronym
-          = hidden_field nil, :new_term_instructions_old, value: @ob_instructions.html_safe
-          %div#new_term_instructions
-            = @ob_instructions.html_safe
-          %button#new_term_instructions_submit{class: "btn", type: "button", title: t('concepts.submit_changes'), alt: "Submit Changes", style: 'display: none;'}
-            = t('concepts.submit_changes')
-          %button#new_term_instructions_cancel{class: "btn", type: "button", title: t('concepts.cancel'), alt: "Cancel", style: 'display: none;'}
-            = t('concepts.cancel')
-          %span#progress_message{style: 'display: none; margin-left: 20px;'}
-    - else
-      %div
-        = @ob_instructions.html_safe
-    - if session[:user].nil?
-      = link_to t('concepts.request_new_term'), login_index_path, style: "font-size: .9em;"
-    - else
-      = link_to t('concepts.request_new_term'), "javascript:void(0);", class: "add_request_term", style: "font-size: .9em;", data: { parent_id: "#{@concept.id}" }
-  %div.request_term_form_div{style: "display: none; clear: both; padding-top: 1em;"}
-
-:javascript
-  var g_prefLabel;
-
-  jQuery(document).ready(function() {
-    g_prefLabel = '#{@concept.prefLabel({:use_html => false}).html_safe}';
-
-    if (!g_prefLabel) {
-      g_prefLabel = '#{@concept.id}';
-    }
-    var isPopulated = window.localStorage.getItem('request_term_form_populated');
-
-    if (isPopulated) {
-      addRequestTermBox("#{@concept.id}");
-    }
-  });
diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml
index 8d690b65fd..bbbb95614b 100644
--- a/app/views/concepts/_show.html.haml
+++ b/app/views/concepts/_show.html.haml
@@ -1,4 +1,4 @@
-= render TurboFrameComponent.new(id: 'concept_show', data: {controller:'labels-ajax-container', 'action': 'turbo:before-fetch-request->labels-ajax-container#abortAll', 'labels-ajax-container-label-ajax-outlet': '#concept_show a[data-controller="label-ajax"]'}) do
+= render TurboFrameComponent.new(id: 'concept_show') do
   - if @concept.id.eql?("bp_fake_root")
     = render Display::AlertComponent.new do
       = t('concepts.use_jump_to')
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index f330566b7b..6cc474bbc6 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -22,18 +22,18 @@
     .home-bubble.home-bubble-one
       %a.h5{href:"/ontologies/#{@anal_ont_names[0]}", style: "color: white !important"}
         = @anal_ont_names[0]
-      %p
-        = @anal_ont_numbers[0].to_s + " " + t('visits.visits')
+      %p 
+        = format_number_abbreviated(@anal_ont_numbers[0]) + " " + (@analytics.empty? ?  t('visits.count') :  t('visits.visits'))
     .home-bubble.home-bubble-two
       %a.h5{href:"/ontologies/#{@anal_ont_names[1]}", style: "color: white !important"}
         = @anal_ont_names[1]
-      %p
-        = @anal_ont_numbers[1].to_s + " " + t('visits.visits')
+      %p 
+        = format_number_abbreviated(@anal_ont_numbers[1]) + " " + (@analytics.empty? ?  t('visits.count') :  t('visits.visits'))
     .home-bubble.home-bubble-three
       %a.h5{href:"/ontologies/#{@anal_ont_names[2]}", style: "color: white !important"}
         = @anal_ont_names[2]
-      %p
-        = @anal_ont_numbers[2].to_s + " " + t('visits.visits')
+      %p 
+        = format_number_abbreviated(@anal_ont_numbers[2]) + " " + (@analytics.empty? ?  t('visits.count') :  t('visits.visits'))
     %a.home-bubble.home-bubble-four{:href => "/visits"}
       .h5 ...
 
@@ -47,7 +47,7 @@
 
 .home-body-container
   .home-section
-    %h4= t('home.ontology_upload')
+    %h4= t('home.ontology_upload', site: portal_name)
     %hr.home-section-line/
     %p= t('home.ontology_upload_desc')
     %p= t('home.ontology_upload_benefits', site: $SITE)
@@ -62,6 +62,56 @@
         = upload_ontology_button
       .discover-ontologies
         = discover_ontologies_button
+  .home-section
+    %h4
+      = t('home.agroportal_figures', site: current_slice_name || portal_name)
+    %hr.home-section-line/
+    .home-statistics-container
+      .home-statistics
+        .home-statistics-item
+          %hr/
+          %div
+            %h4
+              = format_number_abbreviated(@metrics[:ontologies_count])
+            %p= t("home.ontologies")
+        .home-statistics-item
+          %hr/
+          %div
+            %h4
+              = format_number_abbreviated(@metrics[:class_count])
+            %p= t("home.classes")
+        .home-statistics-item
+          %hr/
+          %div
+            %h4
+              = format_number_abbreviated(@metrics[:individuals_count])
+            %p= t("home.individuals")
+        .home-statistics-item
+          %hr/
+          %div
+            %h4
+              = format_number_abbreviated(@metrics[:properties_count])
+            %p= t("home.properties")
+        .home-statistics-item
+          %hr/
+          %div
+            %h4
+              = format_number_abbreviated(@metrics[:projects_count])
+            %p= t("home.projects")
+        .home-statistics-item
+          %hr/
+          %div
+            %h4
+              = format_number_abbreviated(@metrics[:mappings_count])
+            %p= t("home.mappings")
+        .home-statistics-item
+          %hr/
+          %div
+            %h4
+              = format_number_abbreviated(@metrics[:users_count])
+            %p= t("home.users")
+      .home-statistics-link.justify-content-end{style: @analytics.empty? && "visibility: hidden"}
+        = link_to t("home.see_details"),'/statistics', target: "_blank"
 
   .home-section
     %h4
@@ -125,58 +175,7 @@
               = render LoaderComponent.new(type: 'pulsing')
           %script{:async => "", :charset => "utf-8", :src => "https://platform.twitter.com/widgets.js"}
 
-  .home-section
-    %h4
-      = t('home.agroportal_figures', site: current_slice_name || portal_name)
-    %hr.home-section-line/
-    .home-statistics-container
-      .home-statistics
-        .home-statistics-item
-          %hr/
-          %div
-            %h4
-              = format_number_abbreviated(@metrics[:ontologies_count])
-            %p= t("home.ontologies")
-        .home-statistics-item
-          %hr/
-          %div
-            %h4
-              = format_number_abbreviated(@metrics[:class_count])
-            %p= t("home.classes")
-        .home-statistics-item
-          %hr/
-          %div
-            %h4
-              = format_number_abbreviated(@metrics[:individuals_count])
-            %p= t("home.individuals")
-        .home-statistics-item
-          %hr/
-          %div
-            %h4
-              = format_number_abbreviated(@metrics[:properties_count])
-            %p= t("home.properties")
-        .home-statistics-item
-          %hr/
-          %div
-            %h4
-              = format_number_abbreviated(@metrics[:projects_count])
-            %p= t("home.projects")
-        .home-statistics-item
-          %hr/
-          %div
-            %h4
-              = format_number_abbreviated(@metrics[:mappings_count])
-            %p= t("home.mappings")
-        .home-statistics-item
-          %hr/
-          %div
-            %h4
-              = format_number_abbreviated(@metrics[:users_count])
-            %p= t("home.users")
-      .home-statistics-link.justify-content-end{style: @analytics.empty? && "visibility: hidden"}
-        = link_to t("home.see_details"),'/statistics', target: "_blank"
-
-  - if @slices
+  - if slices_enabled?
     .home-section
       .home-section-title
         .text
@@ -238,4 +237,4 @@
   }
   function submitRecommender(){
   document.getElementById("recommender_submit").click()
-  }
+  }
\ No newline at end of file
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index fcc5859ccc..54d83afe8f 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -46,10 +46,6 @@
       {
       }
       ;
-      jQuery(document).data().bp.ontolobridge_ontologies =
-      <%=$NEW_TERM_REQUEST_ONTOLOGIES.to_json.html_safe%> ||
-      [];
-      jQuery(document).data().bp.ont_viewer = {};
       jQuery(document).data().bp.ont_chart = {};
   </script>
 
@@ -60,4 +56,4 @@
 <%= turbo_frame_tag :cookies_modal, src: cookies_path if cookies[:cookies_accepted].nil? && !(Rails.env.development? || Rails.env.test?) %>
 
 <div class="flex-grow-1">
-<%= render partial: 'layouts/notices' %>
\ No newline at end of file
+<%= render partial: 'layouts/notices' %>
diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml
index e7f3010e16..95fe55300d 100644
--- a/app/views/layouts/_ontology_viewer.html.haml
+++ b/app/views/layouts/_ontology_viewer.html.haml
@@ -4,26 +4,6 @@
 
 = render :partial =>'layouts/header'
 %div#bd.bg-white.ontology-viewer
-  :javascript
-    // Ontology viewer vars
-    jQuery(document).data().bp.ont_viewer = {};
-    jQuery(document).data().bp.ont_viewer.ontology_id = jQuery(document).data().bp.ontology.acronym;
-    jQuery(document).data().bp.ont_viewer.ontology_version_id = jQuery(document).data().bp.submission_latest.submissionId;
-    jQuery(document).data().bp.ont_viewer.ontology_name = "#{@ontology.name}";
-    jQuery(document).data().bp.ont_viewer.org_site = "#{$ORG_SITE}";
-    jQuery(document).data().bp.ont_viewer.concept_id = "#{params[:conceptid] || (@concept ? @concept.id : 'root')}";
-    jQuery(document).data().bp.ont_viewer.content_section = "#{sanitize(h(content_section))}";
-    jQuery(document).data().bp.ont_viewer.concept_param = "#{"conceptid=\#{params[:conceptid]}" unless params[:conceptid].nil? || params[:conceptid].empty?}";
-    jQuery(document).data().bp.ont_viewer.concept_name = "#{@concept.prefLabel unless @concept.nil?}";
-    jQuery(document).data().bp.ont_viewer.metadata_only = "#{@ontology.summaryOnly}";
-    jQuery(document).data().bp.ont_viewer.current_purl = "#{@current_purl}";
-    jQuery(document).data().bp.ont_viewer.purl_prefix = "#{($PURL_ENABLED ? $PURL_PREFIX+"/"+@ontology.acronym : '')}";
-    jQuery(document).data().bp.ont_viewer.concept_name_title = (jQuery(document).data().bp.ont_viewer.concept_name == "") ?
-        "" : " - " + jQuery(document).data().bp.ont_viewer.concept_name;
-
-
-
-
   = modal_frame_container
 
   = render partial: 'concepts/perma_link_modal'
diff --git a/app/views/layouts/appliance.html.haml b/app/views/layouts/appliance.html.haml
index 778b0fe1c9..02cddcf9b7 100644
--- a/app/views/layouts/appliance.html.haml
+++ b/app/views/layouts/appliance.html.haml
@@ -21,7 +21,6 @@
       jQuery(document).data({bp: {config: #{bp_config_json.html_safe}, user: #{(session[:user] || {}).to_hash.to_json.html_safe}}});
       jQuery(document).data().bp.ontology = #{@ontology.to_json.html_safe} || {};
       jQuery(document).data().bp.submission_latest = #{@submission_latest.to_json.html_safe} || {};
-      jQuery(document).data().bp.ont_viewer = {};
       jQuery(document).data().bp.ont_chart = {};
 
   %body{:class => "#{controller_name} #{action_name}"}
@@ -35,4 +34,3 @@
       = yield
 
     = render partial: "layouts/footer"
-
diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb
index 429f630109..04686f6ce4 100644
--- a/app/views/layouts/component_preview.html.erb
+++ b/app/views/layouts/component_preview.html.erb
@@ -41,10 +41,6 @@
       {
       }
       ;
-      jQuery(document).data().bp.ontolobridge_ontologies =
-      <%=$NEW_TERM_REQUEST_ONTOLOGIES.to_json.html_safe%> ||
-      [];
-      jQuery(document).data().bp.ont_viewer = {};
       jQuery(document).data().bp.ont_chart = {};
   </script>
 </head>
@@ -57,4 +53,4 @@
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/layouts/component_preview_not_centred.html.erb b/app/views/layouts/component_preview_not_centred.html.erb
index 81b1c29645..f44418358d 100644
--- a/app/views/layouts/component_preview_not_centred.html.erb
+++ b/app/views/layouts/component_preview_not_centred.html.erb
@@ -41,10 +41,6 @@
       {
       }
       ;
-      jQuery(document).data().bp.ontolobridge_ontologies =
-      <%=$NEW_TERM_REQUEST_ONTOLOGIES.to_json.html_safe%> ||
-      [];
-      jQuery(document).data().bp.ont_viewer = {};
       jQuery(document).data().bp.ont_chart = {};
   </script>
 </head>
@@ -53,4 +49,4 @@
   <%= yield %> <!-- rendered preview will be injected here -->
   <%= javascript_include_tag "application" %>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/layouts/popup.html.erb b/app/views/layouts/popup.html.erb
index fda7af5548..731ecdc424 100644
--- a/app/views/layouts/popup.html.erb
+++ b/app/views/layouts/popup.html.erb
@@ -17,7 +17,6 @@
     jQuery(document).data({bp: {config: <%=bp_config_json.html_safe%>, user: <%=(session[:user] || {}).to_hash.to_json.html_safe%>}});
     jQuery(document).data().bp.ontology = <%=@ontology.to_json.html_safe%> || {};
     jQuery(document).data().bp.submission_latest = <%=@submission_latest.to_json.html_safe%> || {};
-    jQuery(document).data().bp.ont_viewer = {};
     jQuery(document).data().bp.ont_chart = {};
   </script>
   <%= csrf_meta_tag %>
@@ -63,4 +62,3 @@
 
 </body>
 </html>
-
diff --git a/app/views/layouts/tool.html.haml b/app/views/layouts/tool.html.haml
index 26350b57b1..94b8efef7d 100644
--- a/app/views/layouts/tool.html.haml
+++ b/app/views/layouts/tool.html.haml
@@ -22,7 +22,6 @@
   = javascript_include_tag "vendor"
   :javascript
     jQuery(document).data({bp: {config: {ui_url: ''}, user: {}}});
-    jQuery(document).data().bp.ont_viewer = {};
     jQuery(document).data().bp.ont_chart = {};
 
 %body{class: " #{controller_name} #{action_name}", style: 'background-color: var(--light-color);'}
@@ -39,4 +38,4 @@
     = yield
 
 
-= javascript_include_tag "application"
\ No newline at end of file
+= javascript_include_tag "application"
diff --git a/app/views/mappings/_concept_mappings.html.haml b/app/views/mappings/_concept_mappings.html.haml
index c71fe9066b..2a6b56b29e 100644
--- a/app/views/mappings/_concept_mappings.html.haml
+++ b/app/views/mappings/_concept_mappings.html.haml
@@ -2,17 +2,16 @@
   = "#{@mappings.size}"
 
 = turbo_frame_tag @type.eql?('modal') ? 'application_modal_content' : 'concept_mappings' do
-  %div{:style => "padding: 1%; width: 98%"}
+  %div.p-1
     - if session[:user].nil?
       = link_to "Create New Mapping", "/login?redirect=/ontologies/#{@ontology.acronym}/?p=classes&t=mappings&conceptid=#{escape(@concept.id)}", :method => :get, :class => "btn btn-default mb-3"
     - else
-      = link_to_modal("Create New Mapping",
-                new_mapping_path(ontology_from: "#{@ontology.id}", conceptid_from: "#{@concept.id}"),
-                id: "new_mapping_btn",
-                role: "button",
-                class: "btn btn-default mb-3",
-                data: { show_modal_title_value: "Create a new mapping for #{@concept.prefLabel}" },
-                )
+      %div{style: 'width: 250px; margin: 0 0 10px 0;'}
+        = link_to_modal(nil,
+                  new_mapping_path(ontology_from: "#{@ontology.id}", conceptid_from: "#{@concept.id}"),
+                  data: { show_modal_title_value: "Create a new mapping for #{@concept.prefLabel}" },
+                  ) do
+          = render Buttons::RegularButtonComponent.new(id:'new_mapping_btn' , value:t('mappings.create_new_mapping'), variant: 'secondary', size: 'slim', state: 'no-anim')
 
     #mapping_details
-      = render :partial => '/mappings/mapping_table'
\ No newline at end of file
+      = render :partial => '/mappings/mapping_table'
diff --git a/app/views/mappings/_mapping_table.html.haml b/app/views/mappings/_mapping_table.html.haml
index 1d91b3b5bb..1492ce2eca 100644
--- a/app/views/mappings/_mapping_table.html.haml
+++ b/app/views/mappings/_mapping_table.html.haml
@@ -1,22 +1,16 @@
 = check_box_tag "delete_mappings_permission", @delete_mapping_permission, @delete_mapping_permission, style: "display: none;"
 %div#concept_mappings_tables_div
   = render_alerts_container(MappingsController)
-  %table#concept_mappings_table.table-content-stripped.table-content{width: "100%", style:'word-break: break-word'}
+  %table#concept_mappings_table.table-content-stripped.table-content.table-mini
     %thead
       %tr
         %th= t("mappings.mapping_table.mapping_to")
-        %th{width: "30%"}= t("mappings.count.ontology")
-        %th= t("mappings.mapping_table.relations")
-        %th= t("mappings.mapping_table.source")
+        %th= t("mappings.count.ontology")
         %th= t("mappings.mapping_table.type")
-        - if current_user_admin?
-          %th{:class => 'delete_mappings_column'}= t("mappings.mapping_table.actions")
+        - if current_user_admin? && !@mappings.all? { |obj| !obj.source.eql?('REST') }
+          %th{:class => 'delete_mappings_column'}
     %tbody#concept_mappings_table_content
       - @mappings.each do |map|
         = render partial: 'mappings/show_line' , locals: {map: map, concept: @concept}
       %tr.empty-state
         %td.text-center{:colspan => "6"}= t("mappings.mapping_table.no_mappings")
-:javascript
-  jQuery(document).ready(function(){
-    ajax_process_init();
-  })
\ No newline at end of file
diff --git a/app/views/mappings/_show.html.haml b/app/views/mappings/_show.html.haml
index 6ca1cffe1f..60bebf6d9e 100644
--- a/app/views/mappings/_show.html.haml
+++ b/app/views/mappings/_show.html.haml
@@ -15,9 +15,7 @@
             %tr
               - map.classes.each do |cls|
                 %td
-                  - if inter_portal_mapping?(cls)
-                    = ajax_to_inter_portal_cls(cls)
-                  - elsif internal_mapping?(cls)
+                  - if internal_mapping?(cls)
                     = ajax_to_internal_cls(cls)
                   - else
                     = ajax_to_external_cls(cls)
@@ -25,8 +23,3 @@
                 #{map.source} #{(map.process || {})[:source_name]}
       .mappings-table-pagination
         = will_paginate @page_results, :update => 'mappings', :params => { :target => params[:target] }
-
-  :javascript
-    jQuery(document).ready(function(){
-      ajax_process_init();  // see bp_ajax_controller.js
-    })
\ No newline at end of file
diff --git a/app/views/mappings/_show_line.html.haml b/app/views/mappings/_show_line.html.haml
index bbfab2b78e..4c94555c4d 100644
--- a/app/views/mappings/_show_line.html.haml
+++ b/app/views/mappings/_show_line.html.haml
@@ -1,56 +1,23 @@
-- process = map.process || {}
-- source = "#{map.source} #{process[:source_name]}"
-- relations = process[:relation]&.each { |relation| get_prefixed_uri(relation)}
+- type, type_tooltip = mapping_type_tooltip(map)
+- cls_link, ont_link, source_tooltip = mapping_links(map, concept)
 - map_id = map.id.to_s.split("/").last
-- target_concept = map.classes.select {|target_concept| target_concept.id != concept.id && target_concept.links['ontology'] != concept.links['ontology']}.first || map.classes.last
 
-- if inter_portal_mapping?(target_concept)
-  - cls_link = ajax_to_inter_portal_cls(target_concept)
-  - ont_name = target_concept.links['ontology']
-  - ont_acronym = ont_name
-  - ont_link = link_to ont_acronym , get_inter_portal_ui_link(target_concept.links['ontology'], process["name"]), target: '_blank'
-  - type = 'Inter-portal'
-- elsif internal_mapping?(target_concept)
-  - begin
-    - ont = target_concept.explore.ontology
-    - ont_name = ont.acronym
-    - ont_link =  link_to ont_name, ontology_path(ont_name), 'data-turbo-frame':'_top'
-  - rescue
-    - ont_name =   target_concept.links['ontology'] || target_concept.id
-    - ont_link =   ont_name
-  - cls_link = raw(get_link_for_cls_ajax(target_concept.id, ont_name, '_top'))
-  - type = 'Internal'
-- else
-  - cls_label = get_label_for_external_cls(target_concept.links["self"])
-  - cls_link = raw("<a href='#{target_concept.links["self"]}' target='_blank'>#{cls_label}</a>")
-  - ont_name = target_concept.links['ontology']
-  - ont_link = link_to ont_name, target_concept.links['ontology'], target: "_blank"
-  - type = 'External'
-  
 %tr.human{:id => map_id}
-  %td
+  %td.mappings-table-mapping-to
     = cls_link
-  %td
+  %td.mappings-table-mapping-to
     = ont_link
   %td
-    - relations&.each do  |r|
-      = r
-      %br/
-  %td
-    #{source}
-    - if !process.nil?
-      - if translation?(process["relation"])
-        %img{:src => asset_path('sifr/english_language_flag.png'), :style => "padding: 5px", :align => "right", :title => "Traduction"}
-  %td
-    = type
+    = render ChipButtonComponent.new(class: 'chip_button_small mr-1', text: type, tooltip:"#{source_tooltip} mapping of type #{type_tooltip}")
+
   - if current_user_admin?
     %td{:class => 'delete_mappings_column'}
       - if map.id && !map.id.empty? && session[:user] && (session[:user].id.to_i == map.creator || session[:user].admin?) && map.source.eql?('REST')
-        %div.d-flex
-          = link_to_modal(t("mappings.show_line.edit_modal"),
+        %div.d-flex.mappings-table-actions
+          = link_to_modal(nil,
                   mapping_path(map_id, {conceptid_from: @concept.id}),
-                  role: "button",
-                  class: "btn btn-link",
+                  class: 'btn btn-link p-0 mr-1',
                   data: { show_modal_title_value: t("mappings.show_line.edit_mapping", preflabel: @concept.prefLabel)},
-                  )
-          = button_to t("mappings.show_line.delete_button"), CGI.unescape(mapping_path(map.id)), method: :delete, class:'btn btn-link',  form: {data: { turbo: true, turbo_confirm: t("mappings.show_line.turbo_confirm"), turbo_frame: '_top'}}
\ No newline at end of file
+                  ) do
+            = inline_svg_tag "edit.svg", width: '15px', height: '15px'
+          = button_to inline_svg_tag('icons/delete.svg', width: '16px', heigth: '16px'), CGI.unescape(mapping_path(map.id)), class: 'btn btn-link p-0', method: :delete,  form: {data: { turbo: true, turbo_confirm: t("mappings.show_line.turbo_confirm"), turbo_frame: '_top'}}
diff --git a/app/views/notes/_new_comment.html.haml b/app/views/notes/_new_comment.html.haml
index 7664085026..94ce3fcd92 100644
--- a/app/views/notes/_new_comment.html.haml
+++ b/app/views/notes/_new_comment.html.haml
@@ -11,4 +11,4 @@
       %div.form-group
         %textarea.form-control.reply_body{cols: "1", name: "body", required: true, placeholder: t('notes.new_comment.comment'), rows: "1", style: "height: 100px;", tabindex: "0"}
 
-      = submit_tag t('notes.new_comment.save') , class:'btn btn-primary btn-block'
+      = form_save_button(enable_loading: false)
diff --git a/app/views/notes/_new_proposal.html.haml b/app/views/notes/_new_proposal.html.haml
index f7b33fe8e8..77666a4442 100644
--- a/app/views/notes/_new_proposal.html.haml
+++ b/app/views/notes/_new_proposal.html.haml
@@ -50,4 +50,4 @@
       .form-group
         = text_field_tag 'proposal[parent]','', placeholder: t('notes.new_proposal.parent'), class: "form-control", required: true
 
-    = submit_tag t('notes.new_proposal.save') , class:'btn btn-primary btn-block'
\ No newline at end of file
+    = form_save_button(enable_loading: false)
diff --git a/app/views/notes/_note_line.html.haml b/app/views/notes/_note_line.html.haml
index ac29099511..6a12aff5f4 100644
--- a/app/views/notes/_note_line.html.haml
+++ b/app/views/notes/_note_line.html.haml
@@ -21,6 +21,6 @@
   - if parent_type.eql?('ontology')
     - row.td do
       - if note.relatedClass && note.relatedClass.length > 0
-        %a{href: "/ontologies/#{ontology_acronym}?p=classes&conceptid=#{CGI.escape(note.relatedClass.first)}", 'data-turbo': 'false'}= note.relatedClass.first
+        = get_link_for_cls_ajax(note.relatedClass.first, ontology_acronym, '_top')
   - row.td do
     = DateTime.parse(note.created).strftime("%Y-%m-%d")
\ No newline at end of file
diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml
index f293e06a2a..84d654e51b 100644
--- a/app/views/notes/_notes.html.haml
+++ b/app/views/notes/_notes.html.haml
@@ -6,16 +6,12 @@
       = add_comment_button(parent_id, parent_type)
     .add_proposal.mx-1
       = add_proposal_button(parent_id, parent_type)
-  %div.ont_notes_filter.my-1.d-flex.justify-content-end.align-items-baseline
-    Filter:
-    %input#hide_archived_ont.mx-1{:checked => "true", :name => "hide_archived_ont", :type => "checkbox"}
-    %label{:for => "hide_archived_ont"}= t('notes.filter_hide_archived')
 
   = render_alerts_container("notes_#{parent_type}_list_table_alerts")
 
   .ont_notes_table_container
     - cols = [ (current_user_admin? ? 'Action' : nil), 'Subject', 'Author', 'Type', (parent_type.eql?('ontology') ? 'Class' : nil),'Created'].compact
-    = render TableComponent.new(id:"#{parent_type}_notes") do |t|
+    = render TableComponent.new(id:"#{parent_type}_notes", searching: true, paging: true, sort_column: @notes.empty? ? nil : (cols.size - 1).to_s, custom_class: 'border rounded p-1') do |t|
       - t.header do |row|
         - row.create(*cols.map{|col| {th: col}})
 
@@ -28,12 +24,3 @@
       - else
         - @notes.each do |note|
           = render partial: 'notes/note_line', locals: {note: note, ontology_acronym: @ontology.acronym, parent_type: parent_type}
-
-:javascript
-  jQuery(".ontologies.show").ready(function(){
-    jQuery("#hide_archived_ont").click(function(){
-      hideOrUnhideArchivedOntNotes();
-    });
-
-    wireOntTable(jQuery("##{notes_table_id}"), #{parent_type.eql?('ontology')}, #{current_user_admin?})
-  });
\ No newline at end of file
diff --git a/app/views/ontologies/_submission_location_form.html.haml b/app/views/ontologies/_submission_location_form.html.haml
index f26f07009d..201c2eae8d 100644
--- a/app/views/ontologies/_submission_location_form.html.haml
+++ b/app/views/ontologies/_submission_location_form.html.haml
@@ -1,4 +1,4 @@
-= render Input::InputFieldComponent.new(label: t("ontologies.location"), name: '') do
+= render Input::InputFieldComponent.new(label: label_required(t("ontologies.location")), name: '') do
   .location-choice
     %input{type: "radio", name: "submission[isRemote]", value: "3", checked: summary_only?, id: "metadata_only", onchange: "displayMetadataOnlyForm()"}
     %label.title{for: "metadata_only"}
diff --git a/app/views/ontologies/new.html.haml b/app/views/ontologies/new.html.haml
index 67a9163866..281ae26167 100644
--- a/app/views/ontologies/new.html.haml
+++ b/app/views/ontologies/new.html.haml
@@ -39,7 +39,7 @@
                         .upload-ontology-field-container
                           - @submission.valid = nil unless @submission.status&.eql?('retired')
                           = attribute_input("valid")
-                  .upload-ontology-field-container
+                  .upload-ontology-field-container.mt-3
                     = render partial: 'ontologies/submission_location_form'
 
                 - c.page do
diff --git a/app/views/ontologies/ontologies_selector/ontologies_selector_results.html.haml b/app/views/ontologies/ontologies_selector/ontologies_selector_results.html.haml
index 2aeafa23df..9bd25a770a 100644
--- a/app/views/ontologies/ontologies_selector/ontologies_selector_results.html.haml
+++ b/app/views/ontologies/ontologies_selector/ontologies_selector_results.html.haml
@@ -2,7 +2,7 @@
     .ontologies-selector-results
         .horizontal-line                  
         .results-number
-            = t("ontologies.showing_ontologies_size", ontologies_size: @ontologies.length, analytics_size: @total_ontologies_number)
+            = t("ontologies.showing_ontologies_size", ontologies_size: @ontologies.length, analytics_size: @total_ontologies_number, portals: portal_name)
             %span.select-all{'data-action': 'click->ontologies-selector#selectall'}
                 = t('ontologies_selector.select_all')
         .ontologies
diff --git a/app/views/ontologies/sections/_metadata.html.haml b/app/views/ontologies/sections/_metadata.html.haml
index cf603dac19..5d3b0005df 100755
--- a/app/views/ontologies/sections/_metadata.html.haml
+++ b/app/views/ontologies/sections/_metadata.html.haml
@@ -3,10 +3,10 @@
   .summary-page-center
     .summary-page-first-row
       = render partial: 'ontologies/sections/metadata/ontology_description_section'
+      = render partial: 'ontologies/sections/metadata/ontology_metrics_section'
       = render partial: 'ontologies/sections/metadata/ontology_fairness_section'
       = render partial: 'ontologies/sections/metadata/ontology_relations_network'
       = render partial: 'ontologies/sections/metadata/ontology_submissions_section'
-      = render partial: 'ontologies/sections/metadata/ontology_metrics_section'
     .summary-page-second-row
       = ontology_depiction_card
       = properties_card(t('ontologies.sections.identifiers'),t("ontologies.sections.identifiers")) do
diff --git a/app/views/ontologies/sections/visualize.html.haml b/app/views/ontologies/sections/visualize.html.haml
index 121b57daa1..2bed4ee9c3 100644
--- a/app/views/ontologies/sections/visualize.html.haml
+++ b/app/views/ontologies/sections/visualize.html.haml
@@ -1,8 +1,6 @@
 =  render TurboFrameComponent.new(id: "classes", data: {"turbo-frame-target": "frame"} ) do
   - unless @error || @concept.nil?
     - @title = "#{@ontology.acronym} - #{@concept.prefLabel}"
-    - @new_term_request_ontologies
-    - @enable_ontolobridge = !$NEW_TERM_REQUEST_ONTOLOGIES.nil? && $NEW_TERM_REQUEST_ONTOLOGIES.include?(@ontology.acronym)
     %div.tooltip
     %div#bd_content.bd_content.explore{data:{controller: 'container-splitter'}}
       %div.sidebar{data:{'container-splitter-target': 'container'}}
@@ -10,12 +8,6 @@
       %div#concept_content.d-flex.flex-column{data:{'container-splitter-target': 'container'}}
         = render partial: 'concepts/show'
 
-    - form_for(:search, :url => {:controller =>'search',:action=>'fetch_results'},:html=>{:id=>'search_form'}) do |f|
-      %input{:name => "search[ontologies][]", :type => "hidden", :value => @ontology.acronym}/
-      = hidden_field :search, :search_type, :value=>"contains"
-      = hidden_field :search, :keyword, :value=>"",:id=>"search_keyword"
   - else
     = render Display::AlertComponent.new(type: 'danger') do
       =  @concept.nil? ? t("ontologies.sections.no_class_concept_found") : @error
-
-
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index cd3eea4235..55bdb61edc 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -53,5 +53,5 @@
   %div#ontology_picker_project{style: "padding-top: 2em;"}
     - selected_ontologies = @project.ontologyUsed && @project.ontologyUsed.map {|id| id.split('/').last } || []
     - locals = { sel_text: t('projects.form.select_ontologies'), selected_ontologies: selected_ontologies, form_object: :project, form_attribute: "ontologyUsed" }
-    = ontologies_selector(id:'projects_page_ontologies_selector' ,name: 'ontologies')              
+    = ontologies_selector(id:'projects_page_ontologies_selector' ,name: 'project[ontologyUsed][]', selected: @usedOntologies)              
 
diff --git a/app/views/taxonomy/index.html.haml b/app/views/taxonomy/index.html.haml
index 967f63d330..b9b2b3a105 100644
--- a/app/views/taxonomy/index.html.haml
+++ b/app/views/taxonomy/index.html.haml
@@ -5,7 +5,7 @@
                 = t('taxonomy.groups_and_categories')
             .line
         .taxonomy-page-decription
-            = t('taxonomy.description')
+            = t('taxonomy.description', portal: portal_name)
 
         = render TabsContainerComponent.new do |c|
             - c.item(title: 'Groups', selected: !@category_section_active)
diff --git a/config/application.rb b/config/application.rb
index d6796fca19..0b91b1434e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,7 +26,6 @@ class Application < Rails::Application
 
     config.autoload_paths += %W[#{config.root}/app/lib/kgcl]
 
-
     config.settings = config_for :settings
     # Initialize configuration for KGCL change request functionality.
     config.change_request = config_for :change_request
diff --git a/config/bioportal_config_env.rb.sample b/config/bioportal_config_env.rb.sample
index 9df04e9af6..845adce930 100644
--- a/config/bioportal_config_env.rb.sample
+++ b/config/bioportal_config_env.rb.sample
@@ -100,14 +100,6 @@ $MULTIPLE_RECOGNIZERS = false
 # ["CPT","ICD10","ICNP","ICPC2P","MDDB","MEDDRA","MSHFRE","MSHSPA_1","NDDF","NDFRT","NIC","RCD","SCTSPA","SNOMEDCT","WHO-ART"]
 $RESTRICTED_DOWNLOADS = []
 
-# Ontolobridge endpoint url
-$ONTOLOBRIDGE_BASE_URL = 'https://ontolobridge.ccs.miami.edu/api-test/requests'
-# Ontolobridge authentication token
-$ONTOLOBRIDGE_AUTHENTICATION_TOKEN = 'Token Uq2pae73ktMtmgjUgtnhEOuHxr9sZeuK'
-
-# Ontologies for which to enable the new term request (Ontolobridge) tab
-$NEW_TERM_REQUEST_ONTOLOGIES = []
-
 # Legacy REST core service address (BioPortal v3.x and lower)
 $LEGACY_REST_URL = 'http://example.org:8080/bioportal'
 
@@ -348,4 +340,3 @@ if $HOSTNAME
     require_relative "bioportal_config_development_#{$HOSTNAME}"
   end
 end
-
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6961dd2fb2..7656f89ae3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -308,40 +308,15 @@ en:
     date_sorted_list_error: The Classes/Concepts didn't define <strong>creation</strong> or <strong>modifications</strong> dates with dcterms
     list_error: The Collection didn't define any member
     close: Close
-    request_terms_instructions: |
-      The text below is displayed to the user as the instructions on how to request new terms for your semantic resource.
-      You can change this text for %{acronym} semantic resource by clicking anywhere on the existing text to 
-      bring up the editing dialog.
-      Click 'Submit Changes' to save or 'Cancel' to discard your changes.
     submit_changes: Submit Changes
-    cancel: Cancel
-    request_new_term: Request New Term
     use_jump_to: Use the "Jump To" to find a class and display details, visualization, notes, and mappings
     instances: Instances
     notes: Notes
     details: Details
     visualization: Visualization
     mappings: Mappings
-    new_term_requests: New Term Requests
     permanent_link_class: Get a permanent link to this class
-    request_term:
-      new_term_instructions: |
-        <p>This ontology integrates with OntoloBridge, allowing community users to suggest additions to the public ontology. Complete the template below to submit a term request directly to the Ontology Manager.</p>
-          <blockquote>
-            <p>Term label (required)<br>Suggested term name. If a term can be described with more than one synonym, enter only the preferred name here.</p>
-          </blockquote>
-          <blockquote>
-            <p>Term Description (required)<br>A brief definition, description, or usage of the suggested term. Synonyms of additional terms may be listed in this section.</p>
-          </blockquote>
-          <blockquote>
-            <p>Superclass (required)<br>The parent term of the suggested term. The parent term must be an existing entry in the current ontology. The superclass can be selected directly from the class tree.</p>
-          </blockquote>
-          <blockquote>
-            <p>References (optional)<br>Provide evidence that the requested term exists, such as IDs of articles or links to other resources describing the term.</p>
-          </blockquote>
-          <blockquote>
-            <p>Justification (optional)<br>Provide here any additional information about the requested term.</p>
-          </blockquote>
+
   home:
     bug: Bug
     proposition: Proposition
@@ -570,13 +545,20 @@ en:
     date: Date
     ontology_visits: Semantic resource visits
   mappings:
+    create_new_mapping: Create new mapping
     all: All
     description: Dive into an overview of the mappings in the bubble view, efficiently locate a specific semantic resource in the table view or upload your own mappings.
     tabs:
       bubble_view: Bubbles view
       table_view: Table view
       upload_mappings: Upload mappings
-    filter_ontologies: Filter semantic resources in the bubble view
+    types_description:
+      cui: Created between 2 concepts that have the same CUI (Concept Unique Identifiers)
+      loom: Lexical mappings created between 2 concepts with very similar labels (preferred name)
+      rest: A mapping added by a user using the REST API (or the UI, which is calling the API to create it)
+      same_uri: Created between 2 concepts with the same URI.
+      skos: Mappings based on SKOS relationships, (e.g. skos:exactMatch or skos:closeMatch)
+    filter_ontologies: Filter ontologies in the bubble view
     filter_bubbles: Filter bubbles
     external_mappings: "External Mappings (%{number_with_delimiter})"
     interportal_mappings: "Interportal Mappings - %{acronym} (%{number_with_delimiter})"
@@ -966,10 +948,6 @@ en:
       comment: Comment
       save: Save
       cancel: Cancel
-  ontolobridge:
-    problem_of_creating_new_term: "Problem creating a new term %{endpoint}: %{class} - %{message}"
-    new_term_instructions_saved: New term request instructions for %{acronym} saved
-    error_saving_new_term_instructions: Unable to save new term instructions for %{acronym} due to a server error
   submissions:
     filter:
       all_formats: All formats
@@ -1447,6 +1425,7 @@ en:
     ontology_visits: Semantic resource visits
     name: name
     visits: visits
+    count: concepts
   ontologies_selector:
     clear_selection: Clear selection
     ontologies_advanced_selection: Semantic resources advanced selection
@@ -1499,7 +1478,7 @@ en:
     privacy_link: "Privacy Statement"
   taxonomy:
     groups_and_categories: Groups and Categories
-    description: In AgroPortal, ontologies are organized in groups and tagged with categories. Typically, groups associate ontologies from the same project or organization for better identification of the provenance. Whereas categories are about subjects/topics and enable to classify ontologies. As of 2016, AgroPortal's categories were established in cooperation with FAO AIMS. In 2024, we moved to UNESCO nomenclature for fields of science and technology. Groups and categories, along with other metadata, can be used on the “Browse” page of AgroPortal to filter out the list of ontologies.
+    description: "In %{portal}, ontologies are organized in groups and tagged with categories. Typically, groups associate ontologies from the same project or organization for better identification of the provenance. Whereas categories are about subjects/topics and enable to classify ontologies. As of 2016, %{portal}'s categories were established in cooperation with FAO AIMS. In 2024, we moved to UNESCO Thesaurus (https://vocabularies.unesco.org). Groups and categories, along with other metadata, can be used on the “Browse” page of %{portal} to filter out the list of ontologies."
     show_sub_categories: Show sub categories
 
   federation:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ac175359ab..cc9b4689ec 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -313,40 +313,13 @@ fr:
     date_sorted_list_error: Les Classes/Concepts n'ont pas défini de dates de <strong>création</strong> ou de <strong>modifications</strong> avec dcterms
     list_error: La Collection n'a défini aucun membre
     close: Fermer
-    request_terms_instructions: |
-      Le texte ci-dessous est affiché à l'utilisateur comme les instructions sur la manière de demander de nouveaux termes pour votre ontologie.
-      Vous pouvez changer ce texte pour l'ontologie %{acronym} en cliquant n'importe où sur le texte existant pour
-      ouvrir la boîte de dialogue d'édition.
-      Cliquez sur 'Soumettre les changements' pour sauvegarder ou sur 'Annuler' pour abandonner vos changements.
-    submit_changes: Soumettre les changements
-    cancel: Annuler
-    request_new_term: Demander un nouveau terme
     use_jump_to: Utilisez le "Jump To" pour trouver une classe et afficher les détails, la visualisation, les notes et les mappages
     instances: Instances
     notes: Notes
     details: Détails
     visualization: Visualisation
     mappings: Alignements
-    new_term_requests: Nouvelles demandes de termes
     permanent_link_class: Obtenir un lien permanent vers cette classe
-    request_term:
-      new_term_instructions: |
-        <p>Cette ontologie s'intègre avec OntoloBridge, permettant aux utilisateurs de la communauté de suggérer des ajouts à l'ontologie publique. Complétez le modèle ci-dessous pour soumettre directement une demande de terme au Gestionnaire de l'Ontologie.</p>
-          <blockquote>
-            <p>Libellé du terme (obligatoire)<br>Nom suggéré pour le terme. Si un terme peut être décrit avec plus d'un synonyme, entrez uniquement le nom préféré ici.</p>
-          </blockquote>
-          <blockquote>
-            <p>Description du terme (obligatoire)<br>Une brève définition, description ou utilisation du terme suggéré. Les synonymes d'autres termes peuvent être listés dans cette section.</p>
-          </blockquote>
-          <blockquote>
-            <p>Superclasse (obligatoire)<br>Le terme parent du terme suggéré. Le terme parent doit être une entrée existante dans l'ontologie actuelle. La superclasse peut être sélectionnée directement à partir de l'arbre des classes.</p>
-          </blockquote>
-          <blockquote>
-            <p>Références (optionnel)<br>Fournissez des preuves que le terme demandé existe, telles que des IDs d'articles ou des liens vers d'autres ressources décrivant le terme.</p>
-          </blockquote>
-          <blockquote>
-            <p>Justification (optionnel)<br>Fournissez ici toute information supplémentaire concernant le terme demandé.</p>
-          </blockquote>
 
   home:
     ontoportal_instances: "Autres installations d’OntoPortal"
@@ -581,12 +554,20 @@ fr:
     ontology_visits: Visites d'ontologies
 
   mappings:
+    create_new_mapping: Créer un nouveau mapping
     all: Tous
     description: Plongez dans une vue d'ensemble des mappings dans la vue en bulles, localisez efficacement une ontologie spécifique dans la vue en tableau ou téléchargez vos propres mappings.
     tabs:
       bubble_view: Vue en bulles
       table_view: Vue en tableau
       upload_mappings: Télécharger des mappings
+    types_description:
+      cui: Créé entre 2 concepts ayant le même CUI (Identifiants Uniques de Concepts)
+      loom: Mappings lexicaux créés entre 2 concepts avec des libellés très similaires (nom préféré)
+      rest: Un mapping ajouté par un utilisateur via l'API REST (ou l'interface utilisateur, qui appelle l'API pour le créer)
+      same_uri: Créé entre 2 concepts ayant la même URI.
+      skos: Mapping basés sur des relations SKOS (par exemple, skos:exactMatch ou skos:closeMatch)
+
     filter_ontologies: Filtrer les ontologies dans la vue en bulles
     filter_bubbles: Filtrer les bulles
     external_mappings: "Mappings externes (%{number_with_delimiter})"
@@ -986,11 +967,6 @@ fr:
       save: Sauvegarder
       cancel: Annuler
 
-  ontolobridge:
-    problem_of_creating_new_term: "Problème de création d'un nouveau terme %{endpoint} : %{class} - %{message}"
-    new_term_instructions_saved: Instructions de demande de nouveau terme pour %{acronym} enregistrées
-    error_saving_new_term_instructions: Impossible d'enregistrer les nouvelles instructions de terme pour %{acronym} en raison d'une erreur serveur
-
   submissions:
     filter:
       all_formats: Tous les formats
@@ -1481,6 +1457,7 @@ fr:
     ontology_visits: Visites de l'ontologie
     name: nom
     visits: visites
+    count: concepts
 
   ontologies_selector:
     clear_selection: Effacer la sélection
@@ -1538,7 +1515,7 @@ fr:
     privacy_policy_anchor: "#h-vie-privee"
   taxonomy:
     groups_and_categories: Groupes et Catégories
-    description: Dans AgroPortal, les ontologies sont organisées en groupes et étiquetées avec des catégories. Typiquement, les groupes associent des ontologies provenant du même projet ou de la même organisation pour une meilleure identification de la provenance. Tandis que les catégories concernent des sujets/thématiques et permettent de classifier les ontologies. En 2016, les catégories d'AgroPortal ont été établies en coopération avec FAO AIMS. En 2024, nous sommes passés à la nomenclature de l'UNESCO pour les domaines des sciences et des technologies. Les groupes et les catégories, ainsi que d'autres métadonnées, peuvent être utilisés sur la page “Parcourir” d'AgroPortal pour filtrer la liste des ontologies.
+    description: "Dans %{portal}, les ontologies sont organisées en groupes et étiquetées avec des catégories. Typiquement, les groupes associent des ontologies provenant du même projet ou de la même organisation pour une meilleure identification de la provenance. Tandis que les catégories concernent des sujets/thématiques et permettent de classifier les ontologies. En 2016, les catégories d'%{portal} ont été établies en coopération avec FAO AIMS. En 2024, nous sommes passés au Thésaurus de l'UNESCO (https://vocabularies.unesco.org). Les groupes et les catégories, ainsi que d'autres métadonnées, peuvent être utilisés sur la page “Parcourir” d'%{portal} pour filtrer la liste des ontologies."
     show_sub_categories: Afficher les sous-catégories
   federation:
     results_from_external_portals: Résultats provenant de portails externes
diff --git a/config/routes.rb b/config/routes.rb
index b17f17cceb..6b35ad7de6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,7 @@
   match 'cookies', to: 'home#set_cookies', via: [:post, :get]
 
   root to: 'home#index'
-  mount LetterOpenerWeb::Engine, at: "/letter_opener" if Rails.env.development?
+  mount LetterOpenerWeb::Engine, at: '/letter_opener' if Rails.env.development?
 
   get'/tools', to: 'home#tools'
   get 'auth/:provider/callback', to: 'login#create_omniauth'
@@ -22,9 +22,7 @@
   resources :agents, constraints: { id: /.+/ }
   post 'agents/:id', to: 'agents#update', constraints: { id: /.+/ }
 
-  resources :ontolobridge do
-    post :save_new_term_instructions, on: :collection
-  end
+
 
   resources :projects, constraints: { id: /[^\/]+/ }
 
@@ -163,8 +161,8 @@
   get 'statistics/index'
 
   # Error pages
-  match "/404", to: "errors#not_found", via: :all
-  match "/500", to: "errors#internal_server_error", via: :all
+  match '/404', to: 'errors#not_found', via: :all
+  match '/500', to: 'errors#internal_server_error', via: :all
 
   # Robots.txt
   get '/robots.txt' => 'robots#index'
@@ -207,16 +205,16 @@
   get '/ajax/classes/date_sorted_list' => 'concepts#show_date_sorted_list'
   get '/ajax/properties/children' => 'properties#show_children'
   get '/ajax/properties/tree' => 'concepts#property_tree'
-  get 'ajax/schemes/label', to: "schemes#show_label"
-  get 'ajax/collections/label', to: "collections#show_label"
-  get 'ajax/label_xl/label', to: "label_xl#show_label"
-  get 'ajax/label_xl', to: "label_xl#show"
+  get 'ajax/schemes/label', to: 'schemes#show_label'
+  get 'ajax/collections/label', to: 'collections#show_label'
+  get 'ajax/label_xl/label', to: 'label_xl#show_label'
+  get 'ajax/label_xl', to: 'label_xl#show'
   get '/ajax/biomixer' => 'concepts#biomixer'
   get '/ajax/fair_score/html' => 'fair_score#details_html'
   get '/ajax/submission/show_licenses/:id' => 'ontologies#show_licenses'
   get '/ajax/fair_score/json' => 'fair_score#details_json'
-  get '/ajax/ontologies', to: "ontologies#ajax_ontologies"
-  get '/ajax/agents', to: "agents#ajax_agents"
+  get '/ajax/ontologies', to: 'ontologies#ajax_ontologies'
+  get '/ajax/agents', to: 'agents#ajax_agents'
   get '/ajax/images/show' => 'application#show_image_modal'
 
   # User
@@ -229,6 +227,7 @@
 
   # Search
   get 'search', to: 'search#index'
+  get 'search/json_search/:id', to: 'search#json_search'
   get 'ajax/search/ontologies/content', to: 'search#json_ontology_content_search'
 
   get 'check_resolvability' => 'check_resolvability#index'
@@ -237,5 +236,5 @@
   # Install the default route as the lowest priority.
   get '/:controller(/:action(/:id))'
 
-  mount Lookbook::Engine, at: "/lookbook"
+  mount Lookbook::Engine, at: '/lookbook'
 end
diff --git a/test/helpers/application_test_helpers.rb b/test/helpers/application_test_helpers.rb
index 975c220eac..28530711f7 100644
--- a/test/helpers/application_test_helpers.rb
+++ b/test/helpers/application_test_helpers.rb
@@ -16,17 +16,27 @@ module Users
     def sign_in_as(username)
       user = fixtures(:users)[username]
       logged_in_user = LinkedData::Client::Models::User.authenticate(user.username, user.password)
-      if logged_in_user && !logged_in_user.errors
-        logged_in_user = create_user(user)
-      end
+      logged_in_user = create_user(user) if logged_in_user && !logged_in_user.errors
       logged_in_user
     end
 
     def create_user(user, admin: false)
-      admin_user = LinkedData::Client::Models::User.authenticate('admin', 'password') if admin
+      admin_user = LinkedData::Client::Models::User.authenticate('admin', 'password')
       existent_user = LinkedData::Client::Models::User.find_by_username(user.username).first
 
-      existent_user.delete if existent_user
+      conn = Faraday.new(url: LinkedData::Client.settings.rest_url) do |faraday|
+        faraday.request :url_encoded
+        faraday.response :logger
+        faraday.adapter Faraday.default_adapter
+        faraday.headers = {
+          "Accept" => "application/json",
+          "Authorization" => "apikey token=#{admin_user.apikey}",
+          "User-Agent" => "NCBO API Ruby Client v0.1.0"
+        }
+
+      end
+
+      conn.delete("/users/#{user.username}") if existent_user
 
       values = user.to_h
       values[:role] = ["ADMINISTRATOR"] if admin
@@ -34,17 +44,6 @@ def create_user(user, admin: false)
 
       if admin
         # Overwrite the normal ".save" to accept creating admin user
-        conn = Faraday.new(url: LinkedData::Client.settings.rest_url) do |faraday|
-          faraday.request :url_encoded
-          faraday.response :logger
-          faraday.adapter Faraday.default_adapter
-          faraday.headers = {
-            "Accept" => "application/json",
-            "Authorization" => "apikey token=#{admin_user.apikey}",
-            "User-Agent" => "NCBO API Ruby Client v0.1.0"
-          }
-
-        end
         conn.post(existent_user.class.collection_path, existent_user.to_hash.to_json, 'Content-Type' => 'application/json')
       else
         existent_user.save
@@ -61,7 +60,22 @@ def delete_users(users = LinkedData::Client::Models::User.all)
     end
 
     def delete_user(user)
-      LinkedData::Client::Models::User.find_by_username(user.username).first&.delete
+      admin_user = LinkedData::Client::Models::User.authenticate('admin', 'password')
+      existent_user = LinkedData::Client::Models::User.find_by_username(user.username).first
+
+      conn = Faraday.new(url: LinkedData::Client.settings.rest_url) do |faraday|
+        faraday.request :url_encoded
+        faraday.response :logger
+        faraday.adapter Faraday.default_adapter
+        faraday.headers = {
+          "Accept" => "application/json",
+          "Authorization" => "apikey token=#{admin_user.apikey}",
+          "User-Agent" => "NCBO API Ruby Client v0.1.0"
+        }
+
+      end
+
+      conn.delete("/users/#{user.username}") if existent_user
     end
   end
 
@@ -133,4 +147,4 @@ def delete_agents(agents = LinkedData::Client::Models::Agent.all)
       Array(agents).each { |g| g.delete }
     end
   end
-end
\ No newline at end of file
+end
diff --git a/test/system/login_flows_test.rb b/test/system/login_flows_test.rb
index d6ff0deb49..8bed283d20 100644
--- a/test/system/login_flows_test.rb
+++ b/test/system/login_flows_test.rb
@@ -22,8 +22,6 @@ class LoginFlowsTest < ApplicationSystemTestCase
     new_user = @user_john
     delete_user(new_user)
 
-    LinkedData::Client::Models::User.find_by_username(new_user.username).first&.delete
-
     fill_in 'user_firstName', with: new_user.firstName
     fill_in 'user_lastName', with: new_user.lastName
     fill_in 'user_username', with: new_user.username
diff --git a/test/system/submission_flows_test.rb b/test/system/submission_flows_test.rb
index 6045308d04..a0c06a4f47 100644
--- a/test/system/submission_flows_test.rb
+++ b/test/system/submission_flows_test.rb
@@ -46,7 +46,6 @@ class SubmissionFlowsTest < ApplicationSystemTestCase
       assert_text cat.acronym.titleize
     end
 
-
     assert_text @new_submission.URI
     assert_text @new_submission.description
     assert_text @new_submission.pullLocation
@@ -103,7 +102,6 @@ class SubmissionFlowsTest < ApplicationSystemTestCase
       click_on "Licensing"
       submission_licensing_edit_fill(ontology_2, submission_2)
 
-
       # Persons and organizations tab
       click_on "Persons and organizations"
       submission_agent_edit_fill(submission_2)
@@ -148,7 +146,10 @@ class SubmissionFlowsTest < ApplicationSystemTestCase
 
     assert_text submission_2.URI
     assert_text submission_2.versionIRI
+
+    wait_for '.submission-status'
     assert_selector '.submission-status', text: submission_2.version
+
     assert_selector ".flag-icon-fr" # todo fix this
     submission_2.identifier.each do |id|
       assert_text id
@@ -258,7 +259,6 @@ class SubmissionFlowsTest < ApplicationSystemTestCase
     assert_text "rdfs"
     assert_text "dct"
 
-
     open_dropdown "#configuration"
 
     submission_2.keyClasses.each do |key|
@@ -341,10 +341,8 @@ class SubmissionFlowsTest < ApplicationSystemTestCase
     sleep 0.5
     click_button 'Back'
 
-
     fill_ontology(ontology_2, submission_2, add_submission: true)
 
-
     assert_selector 'h2', text: 'Ontology submitted successfully!'
     click_on current_url.gsub("/ontologies/success/#{existent_ontology.acronym}", '') + ontology_path(existent_ontology.acronym)
 
@@ -362,7 +360,6 @@ class SubmissionFlowsTest < ApplicationSystemTestCase
     assert_text submission_2.description
     assert_text submission_2.pullLocation
 
-
     # check
     assert_selector '.fas.fa-key' if submission_2.status.eql?('private')
 
@@ -380,7 +377,6 @@ class SubmissionFlowsTest < ApplicationSystemTestCase
       assert_text group.name
     end
 
-
     open_dropdown "#dates"
     assert_date submission_2.modificationDate
     assert_date existent_submission.released
@@ -483,7 +479,6 @@ def submission_agent_edit_fill(submission)
 
     list_inputs "#submissioncontact_from_group_input", "submission[contact]", submission.contact
 
-
     agent1 = fixtures(:agents)[:agent1]
     agent2 = fixtures(:agents)[:agent2]
 
@@ -624,7 +619,6 @@ def fill_ontology(new_ontology, new_submission, add_submission: false)
       list_checks new_ontology.hasDomain.map(&:acronym), @categories.map(&:acronym)
       list_checks new_ontology.group.map(&:acronym), @groups.map(&:acronym)
 
-
       click_button 'Next'
 
       # Page 2
@@ -644,9 +638,9 @@ def fill_ontology(new_ontology, new_submission, add_submission: false)
 
       # Page 3
       if add_submission
-       date_picker_fill_in 'submission[modificationDate]', new_submission.modificationDate
+        date_picker_fill_in 'submission[modificationDate]', new_submission.modificationDate
       else
-       date_picker_fill_in 'submission[released]', new_submission.released
+        date_picker_fill_in 'submission[released]', new_submission.released
       end
 
       list_inputs "#submissioncontact_from_group_input", "submission[contact]", new_submission.contact