diff --git a/.env.sample b/.env.sample
index a38897932a..9d4cb5a54b 100644
--- a/.env.sample
+++ b/.env.sample
@@ -47,8 +47,8 @@ export NODE_ENV=development
 # it's a good idea to use 1 to avoid race conditions when debugging.
 #export WEB_CONCURRENCY=
 #export RAILS_MAX_THREADS=5
-export WEB_CONCURRENCY=1
-export RAILS_MAX_THREADS=1
+#export WEB_CONCURRENCY=1
+#export RAILS_MAX_THREADS=1
 
 # You'll always want to set POSTGRES_USER and POSTGRES_PASSWORD since the
 # postgres Docker image uses them for its default database user and password.
diff --git a/Dockerfile b/Dockerfile
index 4f4062a371..88f019fdb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN apk add --no-cache \
     nodejs \
     tzdata \
     yarn \
+    less \
   && addgroup --gid ${GID} ruby \
   && adduser  -u ${UID} -G ruby -D  ruby \
   && chown ruby:ruby -R /app \
@@ -35,13 +36,14 @@ ENV RAILS_ENV="${RAILS_ENV}" \
 
 COPY --chown=ruby:ruby Gemfile* ./
 RUN bundle install --jobs "$(nproc)"
+RUN gem install rails 
+
 
 
 RUN echo "--modules-folder /node_modules" > .yarnrc
 COPY --chown=ruby:ruby package.json *yarn* ./
 RUN yarn install
 
-ENTRYPOINT ["/app/bin/docker-entrypoint-web"]
 
 EXPOSE 3000
 
diff --git a/Gemfile b/Gemfile
index 526a001508..7de2ef3ea7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -72,7 +72,7 @@ gem 'view_component', '~> 2.72'
 gem 'turnout'
 gem 'will_paginate', '~> 3.0'
 
-gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'master'
+gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development'
 
 
 group :staging, :production, :appliance do
@@ -119,3 +119,4 @@ end
 
 
 gem "net-ftp", "~> 0.2.0", require: false
+gem "net-http"
diff --git a/Gemfile.lock b/Gemfile.lock
index 80d09a7c6f..a78e9f6b80 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git
-  revision: fe929a4dd156920d60ecde9e8f9ef30a2cf5088e
-  branch: master
+  revision: 0c8cd2b377d88b66a979664d5b16e5068b6d4548
+  branch: development
   specs:
     ontologies_api_client (2.2.0)
       activesupport
@@ -158,7 +158,7 @@ GEM
     flamegraph (0.9.5)
     globalid (1.1.0)
       activesupport (>= 5.0)
-    graphql (2.0.16)
+    graphql (2.0.17)
     graphql-client (0.18.0)
       activesupport (>= 3.0)
       graphql
@@ -218,6 +218,8 @@ GEM
     net-ftp (0.2.0)
       net-protocol
       time
+    net-http (0.3.2)
+      uri
     net-imap (0.3.4)
       date
       net-protocol
@@ -233,12 +235,12 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (8.16.0)
     nio4r (2.5.8)
-    nokogiri (1.14.1-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
-    oj (3.14.1)
+    oj (3.14.2)
     open_uri_redirections (0.2.1)
     parallel (1.22.1)
-    parser (3.2.0.0)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
     popper_js (1.16.1)
     pry (0.14.2)
@@ -275,8 +277,10 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
-    rails_autolink (1.1.7)
-      rails (> 3.1)
+    rails_autolink (1.1.8)
+      actionview (> 3.1)
+      activesupport (> 3.1)
+      railties (> 3.1)
     railties (7.0.3)
       actionpack (= 7.0.3)
       activesupport (= 7.0.3)
@@ -292,7 +296,7 @@ GEM
     rdoc (6.3.3)
     recaptcha (5.9.0)
       json
-    regexp_parser (2.6.2)
+    regexp_parser (2.7.0)
     reline (0.3.2)
       io-console (~> 0.5)
     rest-client (2.1.0)
@@ -318,7 +322,7 @@ GEM
       rspec-mocks (~> 3.11)
       rspec-support (~> 3.11)
     rspec-support (3.12.0)
-    rubocop (1.44.1)
+    rubocop (1.45.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -328,8 +332,8 @@ GEM
       rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_parser (3.19.2)
@@ -374,7 +378,7 @@ GEM
     tilt (2.0.11)
     time (0.2.1)
       date
-    timeout (0.3.1)
+    timeout (0.3.2)
     turbo-rails (1.3.3)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -390,6 +394,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
+    uri (0.12.0)
     view_component (2.82.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
@@ -410,7 +415,7 @@ GEM
     will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   x86_64-linux
@@ -446,6 +451,7 @@ DEPENDENCIES
   multi_json
   mysql2 (= 0.5.3)
   net-ftp (~> 0.2.0)
+  net-http
   newrelic_rpm
   oj
   ontologies_api_client!
@@ -478,4 +484,4 @@ DEPENDENCIES
   will_paginate (~> 3.0)
 
 BUNDLED WITH
-   2.3.23
+   2.3.15
diff --git a/app/assets/images/arrow-back.svg b/app/assets/images/arrow-back.svg
new file mode 100644
index 0000000000..2237220b3f
--- /dev/null
+++ b/app/assets/images/arrow-back.svg
@@ -0,0 +1,4 @@
+<svg  width="15" height="12" viewBox="0 0 15 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M5.64176 1L1 6L5.64176 11M14 6H1.13" stroke="black" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
+
diff --git a/app/assets/images/check.svg b/app/assets/images/check.svg
new file mode 100644
index 0000000000..d75aa16adb
--- /dev/null
+++ b/app/assets/images/check.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="8" viewBox="0 0 10 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M9.76764 0.232287C9.45824 -0.0775267 8.95582 -0.0773313 8.646 0.232287L3.59787 5.28062L1.35419 3.03696C1.04438 2.72714 0.542174 2.72714 0.23236 3.03696C-0.0774534 3.34677 -0.0774534 3.84897 0.23236 4.15879L3.03684 6.96326C3.19165 7.11807 3.39464 7.19567 3.59765 7.19567C3.80067 7.19567 4.00386 7.11827 4.15867 6.96326L9.76764 1.3541C10.0775 1.0445 10.0775 0.542081 9.76764 0.232287Z" fill="#76A7CC"/>
+</svg>  
\ No newline at end of file
diff --git a/app/assets/images/github-icon.svg b/app/assets/images/github-icon.svg
new file mode 100644
index 0000000000..9ebf37cb4f
--- /dev/null
+++ b/app/assets/images/github-icon.svg
@@ -0,0 +1,10 @@
+<svg class="register-input-icon" width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#clip0_96_9)">
+        <path d="M9 0.375C4.0275 0.375 0 4.335 0 9.219C0 13.1272 2.5785 16.4415 6.15375 17.61C6.60375 17.6932 6.76875 17.4195 6.76875 17.1847C6.76875 16.9748 6.76125 16.4183 6.7575 15.681C4.254 16.2143 3.726 14.4945 3.726 14.4945C3.3165 13.4738 2.72475 13.2008 2.72475 13.2008C1.9095 12.6525 2.78775 12.6637 2.78775 12.6637C3.6915 12.7253 4.16625 13.575 4.16625 13.575C4.96875 14.9272 6.273 14.5365 6.7875 14.3107C6.8685 13.7385 7.10025 13.3492 7.3575 13.128C5.35875 12.9067 3.258 12.1462 3.258 8.75775C3.258 7.7925 3.60675 7.0035 4.18425 6.38475C4.083 6.16125 3.77925 5.262 4.263 4.044C4.263 4.044 5.01675 3.807 6.738 4.95075C7.458 4.75425 8.223 4.65675 8.988 4.65225C9.753 4.65675 10.518 4.75425 11.238 4.95075C12.948 3.807 13.7017 4.044 13.7017 4.044C14.1855 5.262 13.8818 6.16125 13.7917 6.38475C14.3655 7.0035 14.7142 7.7925 14.7142 8.75775C14.7142 12.1553 12.6105 12.903 10.608 13.1205C10.923 13.386 11.2155 13.9283 11.2155 14.757C11.2155 15.9405 11.2043 16.8915 11.2043 17.1788C11.2043 17.4105 11.3617 17.6873 11.823 17.5988C15.4237 16.4377 18 13.1213 18 9.219C18 4.335 13.9703 0.375 9 0.375Z" fill="#8E8E8E"/>
+    </g>
+    <defs>
+        <clipPath id="clip0_96_9">
+            <rect width="18" height="18" fill="white"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/app/assets/images/green-check.svg b/app/assets/images/green-check.svg
new file mode 100644
index 0000000000..ae048b09de
--- /dev/null
+++ b/app/assets/images/green-check.svg
@@ -0,0 +1,3 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M32 0C14.3559 0 0 14.3559 0 32C0 49.6441 14.3559 64 32 64C49.6441 64 64 49.6441 64 32C64 14.3559 49.6441 0 32 0ZM49.8847 23.579L29.4336 43.8697C28.2306 45.0727 26.3058 45.1529 25.0226 43.9499L14.1955 34.0852C12.9123 32.8822 12.8321 30.8772 13.9549 29.594C15.1579 28.3108 17.1629 28.2306 18.4461 29.4336L27.0276 37.2932L45.3133 19.0075C46.5965 17.7243 48.6015 17.7243 49.8847 19.0075C51.1679 20.2907 51.1679 22.2957 49.8847 23.579Z" fill="#2FDA55"/>
+</svg>
diff --git a/app/assets/images/orcid.svg b/app/assets/images/orcid.svg
new file mode 100644
index 0000000000..1f8c827df7
--- /dev/null
+++ b/app/assets/images/orcid.svg
@@ -0,0 +1,13 @@
+<svg  width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#clip0_96_22)">
+        <path d="M18 9C18 13.9711 13.9711 18 9 18C4.02891 18 0 13.9711 0 9C0 4.02891 4.02891 0 9 0C13.9711 0 18 4.02891 18 9Z" fill="#8E8E8E"/>
+        <path d="M5.97658 13.0089H4.8911V5.51367H5.97658V8.90086V13.0089Z" fill="white"/>
+        <path d="M7.56956 5.51367H10.5018C13.293 5.51367 14.5195 7.49419 14.5195 9.26477C14.5195 11.1893 13.004 13.0159 10.5159 13.0159H7.56956V5.51367ZM8.65504 12.0431H10.3819C12.8419 12.0431 13.4058 10.1885 13.4058 9.26477C13.4058 7.76013 12.4401 6.48644 10.3256 6.48644H8.65504V12.0431Z" fill="white"/>
+        <path d="M6.14575 3.95305C6.14575 4.33795 5.82856 4.65987 5.43384 4.65987C5.03912 4.65987 4.72194 4.33795 4.72194 3.95305C4.72194 3.56114 5.03912 3.24622 5.43384 3.24622C5.82856 3.24622 6.14575 3.56814 6.14575 3.95305Z" fill="white"/>
+    </g>
+    <defs>
+        <clipPath id="clip0_96_22">
+            <rect width="18" height="18" fill="white"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/app/assets/images/red-warning.svg b/app/assets/images/red-warning.svg
new file mode 100644
index 0000000000..dea7593d68
--- /dev/null
+++ b/app/assets/images/red-warning.svg
@@ -0,0 +1,5 @@
+<svg width="67" height="59" viewBox="0 0 67 59" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.1905 2.82155L0.756584 50.335C0.261031 51.193 9.17164e-05 52.1664 2.41733e-08 53.1573C-9.1668e-05 54.1481 0.260668 55.1215 0.756062 55.9796C1.25146 56.8377 1.96403 57.5503 2.82214 58.0457C3.68025 58.5411 4.65366 58.8019 5.64451 58.8018H60.5079C61.4987 58.8019 62.4722 58.5411 63.3303 58.0457C64.1884 57.5503 64.9009 56.8377 65.3963 55.9796C65.8917 55.1215 66.1525 54.1481 66.1524 53.1573C66.1523 52.1664 65.8914 51.193 65.3958 50.335L37.9649 2.82155C37.4695 1.96368 36.7572 1.25131 35.8993 0.756028C35.0414 0.260745 34.0683 0 33.0777 0C32.0871 0 31.114 0.260745 30.2561 0.756028C29.3982 1.25131 28.6858 1.96368 28.1905 2.82155Z" fill="#EE404C"/>
+<path d="M33.4356 17.4757H32.7199C30.9581 17.4757 29.5298 18.904 29.5298 20.6659V35.9142C29.5298 37.6761 30.9581 39.1043 32.7199 39.1043H33.4356C35.1974 39.1043 36.6257 37.6761 36.6257 35.9142V20.6659C36.6257 18.904 35.1974 17.4757 33.4356 17.4757Z" fill="#FFF7ED"/>
+<path d="M33.0777 51.1978C35.0372 51.1978 36.6257 49.6094 36.6257 47.6499C36.6257 45.6904 35.0372 44.1019 33.0777 44.1019C31.1183 44.1019 29.5298 45.6904 29.5298 47.6499C29.5298 49.6094 31.1183 51.1978 33.0777 51.1978Z" fill="#FFF7ED"/>
+</svg>
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c423cebb5a..f73139ead6 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,7 +13,6 @@
 //= require bioportal
 //= require admin/licenses
 //= require bp_ajax_controller
-//= require bp_ontology_viewer
 //= require bp_reviews
 //= require bp_notes
 //= require bp_ontolobridge
@@ -32,7 +31,6 @@
 //= require_tree ./components
 //= require ontologies
 //= require projects
-//= require submissions
 //= require tooltipster.bundle.min
 //= require application_esbuild
 customElements.define('data-table-loader', DataTableLoader );
diff --git a/app/assets/javascripts/bp_notes.js b/app/assets/javascripts/bp_notes.js
index eb400f1e87..61f9e8f447 100644
--- a/app/assets/javascripts/bp_notes.js
+++ b/app/assets/javascripts/bp_notes.js
@@ -1,348 +1,3 @@
-var ontNotesTable;
-var ont_columns = { archived: 3, date: 7, subjectSort: 2 };
-
-
-NOTES_PROPOSAL_TYPES = {
-  "ProposalNewClass": "New Class Proposal",
-  "ProposalChangeHierarchy": "New Relationship Proposal",
-  "ProposalChangeProperty": "Change Property Value Proposal"
-}
-
-function getUser() {
-  return jQuery(document).data().bp.user;
-}
-
-function setupNotesFacebox() {
-  jQuery("a.notes_list_link").attr("rel", "facebox[.facebox_note]");
-  jQuery("a.notes_list_link").each(function() {
-    if (!jQuery(this).data().faceboxInit) {
-      jQuery(this).facebox();
-      jQuery(this).data().faceboxInit = true;
-    }
-  })
-}
-
-function setupNotesFaceboxSizing() {
-  jQuery(document).bind('afterReveal.facebox', function() {
-    jQuery("div.facebox_note").parents("div#facebox").width('850px');
-    jQuery("div.facebox_note").width('820px');
-    jQuery("div.facebox_note").parents("div#facebox").css("max-height", jQuery(window).height() - (jQuery("#facebox").offset().top - jQuery(window).scrollTop()) * 2 + "px");
-    jQuery("div.facebox_note").parents("div#facebox").centerElement();
-  });
-}
-
-function bindAddCommentClick() {
-  jQuery("a.add_comment").live('click', function(){
-    var id = jQuery(this).attr("data-parent-id");
-    var type = jQuery(this).attr("data-parent-type");
-    addCommentBox(id, type, this);
-  });
-}
-
-function bindAddProposalClick() {
-  jQuery("a.add_proposal").live('click', function(){
-    var id = jQuery(this).attr("data-parent-id");
-    var type = jQuery(this).attr("data-parent-type");
-    addProposalBox(id, type, this);
-  });
-}
-
-function bindReplyClick() {
-  jQuery("a.reply_reply").live('click', function(){
-    addReplyBox(this);
-    jQuery(this).hide();
-  });
-}
-
-function bindReplyCancelClick() {
-  jQuery(".reply .cancel, .create_note_form .cancel").live('click', function(){
-    removeReplyBox(this);
-  });
-}
-
-function bindProposalChange() {
-  jQuery(".create_note_form .proposal_type").live('change', function(){
-    var selector = jQuery(this);
-    proposalFields(selector.val(), selector.parent().children(".proposal_container"));
-  });
-}
-
-function bindReplySaveClick() {
-  jQuery(".reply .save, .create_note_form .save").live('click', function(){
-    var user = getUser();
-    var id = jQuery(this).data("parent_id");
-    var type = jQuery(this).data("parent_type");
-    var button = this;
-    var body = jQuery(this).closest(".reply_box").children(".reply_body").val();
-    var subject = subjectForNote(button);
-    var ontology_id = jQuery(document).data().bp.ont_viewer.ontology_id;
-    jQuery(button).parent().children(".reply_status").html("");
-    if (type === "class") {
-      id = {class: id, ontology: ontology_id};
-    }
-    jQuery.ajax({
-      type: "POST",
-      url: "/notes",
-      data: {parent: id, type: type, subject: subject, body: body, proposal: proposalMap(button), creator: user["id"]},
-      success: function(data){
-        var note = data;
-        var status = data[1];
-        if (status && status >= 400) {
-          displayError(button);
-        } else {
-          addNoteOrReply(button, note);
-          removeReplyBox(button);
-        }
-      },
-      error: function(){displayError(button);}
-    });
-  });
-}
-
-
-var displayError = function(button) {
-  jQuery(button).parent().children(".reply_status").html("Error, please try again");
-}
-
-function addCommentBox(id, type, button) {
-  var formContainer = jQuery(button).parents(".notes_list_container").children(".create_note_form");
-  var commentSubject = jQuery("<input>")
-    .attr("type", "text")
-    .attr("placeholder", "Subject")
-    .addClass("comment_subject")
-    .add("<br>");
-  var commentFields = commentSubject.add(commentForm(id,type));
-  var commentWrapper = jQuery("<div>").addClass("reply_box").append(commentFields);
-  formContainer.html(commentWrapper);
-  formContainer.show();
-}
-
-function addProposalBox(id, type, button) {
-  var formContainer = jQuery(button).parents(".notes_list_container").children(".create_note_form");
-  var proposalForm = jQuery("<div>").addClass("reply_box");
-  var select = jQuery("<select>").addClass("proposal_type");
-  var proposalContainer;
-  for (var proposalType in NOTES_PROPOSAL_TYPES) {
-    select.append(jQuery("<option>").attr("value", proposalType).html(NOTES_PROPOSAL_TYPES[[proposalType]]));
-  }
-  proposalForm.html("Proposal type: ");
-  proposalForm.append(select);
-  proposalForm.append("<br/>");
-
-  proposalContainer = jQuery("<div>").addClass("proposal_container");
-
-  // Proposal-specific fields
-  proposalFields(Object.keys(NOTES_PROPOSAL_TYPES).shift(), proposalContainer);
-
-  proposalForm.append(proposalContainer);
-  proposalForm.append(jQuery("<div>").addClass("proposal_buttons").append(commentButtons(id, type)));
-  formContainer.html(proposalForm);
-  formContainer.show();
-}
-
-function addNoteOrReply(button, note) {
-  if (note["type"] === "http://data.bioontology.org/metadata/Note") {
-    // Create a new note in the note table
-    addNote(button, note);
-  } else if (note["type"] === "http://data.bioontology.org/metadata/Reply") {
-    // Create a new reply in the thread
-    addReply(button, note);
-  }
-}
-
-function addNote(button, note) {
-  var user = getUser();
-  var id = note["id"].split("/").pop();
-  var noteLink = generateNoteLink(id, note);
-  var noteLinkHTML = jQuery("<div>").append(noteLink).html();
-  var created = note["created"].split("T")[0];
-  // TODO_REV: Add column for note delete checkbox
-  var deleteBox = "";
-  var noteType = getNoteType(note);
-  var noteRow = [deleteBox, noteLinkHTML, note["subject"], "false", user["username"], noteType, "", created];
-  // Add note to concept table (if we're on a concept page)
-  if (jQuery(button).closest("#notes_content").length > 0) {
-    var jRow = jQuery("<tr>");
-    jRow.append(jQuery("<td>").html(generateNoteLink("concept_"+id, note)));
-    jRow.append(jQuery("<td>").html(user["username"]));
-    jRow.append(jQuery("<td>").html(noteType));
-    jRow.append(jQuery("<td>").html(created));
-    jQuery("table.concept_notes_list").prepend(jRow);
-    jQuery("#note_count").html(parseInt(jQuery("#note_count").html()) + 1);
-    jQuery("a#concept_"+id).facebox();
-  }
-  // Add note to main table
-  if (typeof ontNotesTable !== "undefined") {
-    ontNotesTable.fnAddData(noteRow);
-  }
-  jQuery("a#"+id).facebox();
-}
-
-function addReply(button, note) {
-  var user = getUser();
-  var reply = jQuery("<div>").addClass("reply");
-  var replyAuthor = jQuery("<div>").addClass("reply_author").html("<b>"+user["username"]+"</b> seconds ago");
-  var replyBody = jQuery("<div>").addClass("reply_body").html(note.body);
-  var replyMeta = jQuery("<div>").addClass("reply_meta");
-  replyMeta.append(jQuery("<a>").addClass("reply_reply").attr("data-parent-id", note["id"]).attr("href", "#reply").html("reply"));
-  reply.append(replyAuthor).append(replyBody).append(replyMeta);
-  jQuery(button).closest("div.reply").children(".discussion").children(".discussion_container").prepend(reply);
-}
-
-function addReplyBox(button) {
-  var id = jQuery(button).attr("data-parent-id");
-  var type = jQuery(button).attr("data-parent-type");
-  var formHTML = commentForm(id, type);
-  jQuery(button).closest("div.reply").children("div.reply_meta").append(jQuery("<div>").addClass("reply_box").html(formHTML));
-}
-
-function removeReplyBox(button) {
-  jQuery(button).closest("div.reply").children(".reply_meta").children("a.reply_reply").show();
-  jQuery(button).closest("div.reply").children(".reply_meta").children(".reply_box").remove();
-  jQuery(button).closest(".create_note_form").html("");
-}
-
-function commentForm(id, type) {
-  return commentTextArea().add(commentButtons(id, type));
-}
-
-function commentTextArea() {
-  return jQuery("<textarea>")
-    .addClass("reply_body")
-    .attr("rows","1")
-    .attr("cols","1")
-    .attr("name","text")
-    .attr("tabindex","0")
-    .attr("placeholder","Comment")
-    .css({"width": "500px", "height": "100px"})
-    .add("<br>");
-}
-
-function commentButtons(id, type) {
-  var button_submit = jQuery("<button>")
-    .attr("type","submit")
-    .attr("onclick","")
-    .data("parent_id", id)
-    .data("parent_type", type)
-    .attr("style", "margin-right: 1em;")
-    .addClass("save")
-    .addClass("btn")
-    .addClass("btn-primary")
-    .html("save");
-  var button_cancel = jQuery("<button>")
-    .attr("type","button")
-    .attr("onclick","")
-    .addClass("cancel")
-    .addClass("btn")
-    .addClass("btn-primary")
-    .html("cancel");
-  var span_status = jQuery("<span>")
-    .addClass("reply_status")
-    .css({"color": "red", "paddingLeft": "5px"});
-  return button_submit.add(button_cancel).add(span_status);
-}
-
-function appendField(id, text, div) {
-  if (jQuery.browser.msie && parseInt(jQuery.browser.version) < 10) {
-    div.append(jQuery("<span>").css("font-weight", "bold").html(text));
-    div.append("<br/>");
-  }
-  div.append(jQuery("<input>").attr("type", "text").attr("id", id).attr("placeholder", text));
-  div.append("<br/>");
-}
-
-function proposalFields(type, container) {
-  container.html("");
-  appendField("reasonForChange", "Reason for change", container);
-  if (type === "ProposalChangeHierarchy") {
-    appendField("newTarget", "New target", container);
-    appendField("oldTarget", "Old target", container);
-    appendField("newRelationshipType", "Relationship type", container);
-  } else if (type === "ProposalChangeProperty") {
-    appendField("propertyId", "Property id", container);
-    appendField("newValue", "New value", container);
-    appendField("oldValue", "Old Value", container);
-  } else if (type === "ProposalNewClass") {
-    appendField("classId", "Class id", container);
-    appendField("label", "Label", container);
-    appendField("synonym", "Synonym", container);
-    appendField("definition", "Definition", container);
-    appendField("parent", "Parent", container);
-  }
-}
-
-function proposalMap(button) {
-  var formContainer = jQuery(button).parents(".notes_list_container").children(".create_note_form");
-  var lists = ["synonym", "definition", "newRelationshipType"];
-  var map = {};
-  map["type"] = formContainer.find(".proposal_type").val();
-  console.log(formContainer.find(".proposal_container input"))
-  formContainer.find(".proposal_container input").each(function(){
-    var input = jQuery(this);
-    var id = input.attr("id");
-    var val = (jQuery.inArray(id, lists) >= 0) ? input.val().split(",") : input.val();
-    map[id] = val;
-  });
-  return map;
-}
-
-function subjectForNote(button) {
-  var subject = jQuery(button).closest(".reply_box").children(".comment_subject").val();
-  var reasonForChange = jQuery("input#reasonForChange");
-  if (typeof subject === "undefined" || (subject.length === 0 && reasonForChange.length > 0)) {
-    subject = NOTES_PROPOSAL_TYPES[$(".proposal_type").val()] + ": " + reasonForChange.val();
-  }
-  return subject;
-}
-
-function generateNoteLink(id, note) {
-  return jQuery("<a>")
-    .addClass("ont_notes_list_link")
-    .addClass("notes_list_link")
-    .attr("href", "/ontologies/"+jQuery(document).data().bp.ont_viewer.ontology_id+"/notes/"+encodeURIComponent(note["id"]))
-    .attr("id", id)
-    .html(note["subject"]);
-}
-
-function getNoteType(note) {
-  if (typeof note["proposal"] !== "undefined") {
-    return NOTES_PROPOSAL_TYPES[note["proposal"][0]];
-  } else {
-    return "Comment";
-  }
-}
-
-function subscribeToNotes(button) {
-  var ontologyId = jQuery(button).attr("data-bp_ontology_id");
-  var isSubbed = jQuery(button).attr("data-bp_is_subbed");
-  var userId = jQuery(button).attr("data-bp_user_id");
-
-  jQuery(".notes_sub_error").html("");
-  jQuery(".notes_subscribe_spinner").show();
-
-  jQuery.ajax({
-    type: "POST",
-    url: "/subscriptions?user_id="+userId+"&ontology_id="+ontologyId+"&subbed="+isSubbed,
-    dataType: "json",
-    success: function(data) {
-      jQuery(".notes_subscribe_spinner").hide();
-
-      // Change subbed value on a element
-      var subbedVal = (isSubbed == "true") ? "false" : "true";
-      jQuery("a.subscribe_to_notes").attr("data-bp_is_subbed", subbedVal);
-
-      // Change button text
-      var txt = jQuery("a.subscribe_to_notes").html();
-      var newButtonText = txt.match("Unsubscribe") ? txt.replace("Unsubscribe", "Subscribe") : txt.replace("Subscribe", "Unsubscribe");
-      jQuery("a.subscribe_to_notes").html(newButtonText);
-    },
-    error: function(data) {
-      jQuery(".notes_subscribe_spinner").hide();
-      jQuery(".notes_sub_error").html("Problem subscribing to emails, please try again");
-    }
-  });
-}
-
 function hideOrUnhideArchivedOntNotes() {
   if (jQuery("#hide_archived_ont:checked").val() !== undefined) {
     // Checked
@@ -353,24 +8,33 @@ function hideOrUnhideArchivedOntNotes() {
   }
 }
 
-function wireOntTable(ontNotesTableNew) {
+function wireOntTable(ontNotesTableNew, showTarget= true, enableDelete = false) {
   jQuery.data(document.body, "ontology_id", "#{@ontology.acronym}");
 
-  ontNotesTable = ontNotesTableNew;
+
+  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": [
-      { "bVisible": false }, // Delete
-      { "iDataSort": ont_columns.subjectSort }, // Subject link
-      { "bVisible": false }, // Subject for sort
-      { "bVisible": false }, // Archived for filter
-      null, // Author
-      null, // Type
-      null, // Target
-      null // Created
-    ],
+    "aoColumns": columns,
   });
   // Important! Table is somehow getting set to zero width. Reset here.
   jQuery(ontNotesTable).css("width", "100%");
diff --git a/app/assets/javascripts/bp_ontology_viewer.js.erb b/app/assets/javascripts/bp_ontology_viewer.js.erb
deleted file mode 100644
index 6652d6840c..0000000000
--- a/app/assets/javascripts/bp_ontology_viewer.js.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-const nav_ont = function (link) {
-    const page = jQuery(link).attr("data-bp-ont-page");
-    const page_name = jQuery(link).attr("data-bp-ont-page-name");
-    History.pushState({p: page}, page_name + " | " + jQuery(document).data().bp.ont_viewer.org_site, "?p=" + page);
-}
-
-jQuery("#navbar-ontology a").on("click", function (e) {
-    e.preventDefault();
-    nav_ont(this)
-});
\ No newline at end of file
diff --git a/app/assets/javascripts/submissions.js.erb b/app/assets/javascripts/submissions.js.erb
deleted file mode 100644
index d78a2fb123..0000000000
--- a/app/assets/javascripts/submissions.js.erb
+++ /dev/null
@@ -1,127 +0,0 @@
-// Show/hide location inputs
-function location_toggle(input_div) {
-  jQuery('.hidden_field').hide();
-  jQuery('.hidden_field input').attr("disabled", true);
-  jQuery('#' + input_div + " input").removeAttr("disabled");
-  jQuery('#' + input_div).show();
-}
-
-jQuery(document).ready(function(){
-  jQuery(".datepicker").each(function() {
-    $(this).datepicker({
-      dateFormat: "M d, yy",
-    });
-  });
-  jQuery("#ui-datepicker-div").css("display", "none");
-
-  // Properly display the information for 'File Location' based on radio button
-  if (jQuery("#submission_isRemote_0").is(":checked")) {
-    location_toggle("upload");
-  }
-  
-  if (jQuery("#submission_isRemote_1").is(":checked")) {
-    location_toggle("remote");
-  }
-  
-  // Select default 'File Location' radio button
-  if (!jQuery("#submission_isRemote_0").is(":checked") && !jQuery("#submission_isRemote_1").is(":checked") && !jQuery("#submission_isRemote_2").is(":checked")) {
-    jQuery("#submission_isRemote_0").attr("checked", "checked")
-  }
-
-  jQuery("#submission_hasOntologyLanguage").change(function() {
-    toggleOntologyFormatOptions(jQuery(this).val());
-  });
-  jQuery("#submission_hasOntologyLanguage").trigger("change");
-
-  jQuery("#collapseOWLOptions").click(function() {
-    var button = jQuery(this);
-    button.text(button.text() == "Show advanced OWL options" ? "Hide advanced OWL options" : "Show advanced OWL options");
-  })
-
-  jQuery("#contacts").on("click", ".add-contact", addContact);
-  jQuery("#contacts").on("click", ".remove-contact", removeContact);
-
-  jQuery("#ontology_submission_form").validate({
-    highlight: function(element) {
-      $(element).closest('.form-group').addClass('has-error');
-    },
-    unhighlight: function(element) {
-      $(element).closest('.form-group').removeClass('has-error');
-    },
-    errorElement: 'span',
-    errorClass: 'help-block error-help-block',
-    errorPlacement: function(error, element) {
-      if(element.parent('.input-group').length) {
-        error.insertAfter(element.parent());
-      } else {
-        error.insertAfter(element);
-      }
-    }  
-  });
-});
-
-function addContact(event) {
-  event.preventDefault();
-
-  var contacts = document.querySelectorAll("div.contact");
-  var newContact = contacts[0].cloneNode(true);
-  newContact.classList.add("offset-sm-2");
-
-  var removeButton = newContact.querySelector("button").cloneNode(true);
-  removeButton.classList.replace("btn-success", "btn-danger");
-  removeButton.classList.replace("add-contact", "remove-contact");
-  removeButton.classList.add("ml-1")
-  removeButton.querySelector("i").classList.replace("fa-plus", "fa-minus");
-  newContact.appendChild(removeButton);
-  
-  var index = contacts.length;
-  var inputs = newContact.getElementsByTagName("input");
-  for (var i = 0; i < inputs.length; i++) {
-    var input = inputs[i];
-
-    var id = input.getAttribute("id").replace(/0/g, index);
-    input.setAttribute("id", id);
-
-    var name = input.getAttribute("name").replace(/0/g, index);
-    input.setAttribute("name", name);
-    
-    input.setAttribute("value", "");
-
-    input.removeAttribute("required");
-  }
-
-  contacts[index - 1].insertAdjacentElement('afterend', newContact);
-}
-
-function removeContact(event) {
-  event.preventDefault();
-
-  var target = event.target;
-  var contact;
-  if (target.matches("button.remove-contact")) {
-    contact = target.parentNode;
-  } else if (target.matches("i.fa-minus")) {
-    contact = target.parentNode.parentNode;
-  }
-
-  document.querySelector("#contacts").removeChild(contact);
-}
-
-function toggleOntologyFormatOptions(selectedFormat) {
-  var advancedOWLOptionsButton = jQuery("#collapseOWLOptions");
-  var skosHelpText = jQuery("#helpSkosFormat");
-  
-  switch(selectedFormat){
-    case 'OWL':
-      advancedOWLOptionsButton.show();
-      skosHelpText.hide();
-      break;
-    case 'SKOS':
-      advancedOWLOptionsButton.hide();
-      skosHelpText.show();
-      break;
-    default:
-      advancedOWLOptionsButton.hide();
-      skosHelpText.hide();
-  }
-}
diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
index 2821e98d95..2aa6ca2767 100644
--- a/app/assets/stylesheets/application.css.scss.erb
+++ b/app/assets/stylesheets/application.css.scss.erb
@@ -20,7 +20,7 @@
  *= require thickbox
  *= require select2
  *= require trumbowyg
- *
+ *= require theme-variables
  */
 
 /* BioPortal */
@@ -42,6 +42,12 @@
 @import "fair_assement";
 @import "instances_table";
 @import "file_uploader";
+@import "register";
+@import "lostpassword";
+@import "flatpickr/dist/themes/light";
+@import "feedback";
+@import "login";
+@import "components/index";
 
 /* Bootstrap and Font Awesome */
 @import "bootstrap";
diff --git a/app/assets/stylesheets/bioportal.scss b/app/assets/stylesheets/bioportal.scss
index 5788f6c573..3ccb941b11 100644
--- a/app/assets/stylesheets/bioportal.scss
+++ b/app/assets/stylesheets/bioportal.scss
@@ -49,7 +49,7 @@
 #bd {
   background: #fff;
 }
-#bd hr {
+#bd > hr {
   border:0;
   height:1px;
   color:#e9eaeb;
@@ -511,6 +511,27 @@ li.ac_over > .obsolete_class {
   cursor: inherit;  /*override the help cursor for selection menus*/
 }
 
+.concept_details p {
+  margin-bottom: .5em;
+}
+
+.concept_details .label {
+  vertical-align: top;
+  width: 180px;
+  max-width: 200px;
+}
+
+.concept_details tbody td {
+  padding: 0.6em 0.8em 0 !important;
+  white-space: normal; /* css-3 */
+  white-space: -moz-normal; /* Mozilla, since 1999 */
+  word-wrap: break-word; /* Internet Explorer 5.5+ */
+}
+
+.concept_details td:nth-child(1) {
+  white-space: nowrap;
+}
+
 #format_specific_options td {
   border-top: 1px solid #C1DAD7;
 }
diff --git a/app/assets/stylesheets/bootstrap_overrides.scss b/app/assets/stylesheets/bootstrap_overrides.scss
index 20f2d1335f..0ffd5f1d3a 100644
--- a/app/assets/stylesheets/bootstrap_overrides.scss
+++ b/app/assets/stylesheets/bootstrap_overrides.scss
@@ -28,6 +28,10 @@ footer.footer .list-inline-item:not(:last-child) {
   margin-right: 1rem;
 }
 
+.not-disabled {
+  background-color: white !important;
+}
+
 @media only screen and (max-width: 992px) {
   body {
     margin-bottom: 350px; 
diff --git a/app/assets/stylesheets/components/card_message.scss b/app/assets/stylesheets/components/card_message.scss
new file mode 100644
index 0000000000..0201775d31
--- /dev/null
+++ b/app/assets/stylesheets/components/card_message.scss
@@ -0,0 +1,40 @@
+.card-message-card{
+    margin-top: 30px;
+    padding: 37px 41px;
+    box-shadow: rgba(0, 0, 0, 0.05) 0px 20px 50px;
+    border-radius: 14px;
+}
+.card-message-title{
+    font-size: 19px;
+    text-align: center;
+    margin-bottom: 10px;
+    font-weight: 700;
+}
+.card-message-text{
+    text-align: center;
+    width: 310px;
+    font-size: 14px;
+    font-weight: 500;
+    margin-bottom: 21px;
+}
+.card-message-button{
+    padding: 16px;
+    border-radius: 9px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    text-decoration: none !important;
+}
+.card-message-button-success{
+    color: var(--primary-color);
+    border: 1px solid var(--primary-color);
+}
+.card-message-button-failure{
+    color: #EE404C !important;
+    border: 1px solid #EE404C;
+}
+.card-message-has-title{
+    color: #666666;
+    font-weight: 400;
+}
diff --git a/app/assets/stylesheets/components/chips.scss b/app/assets/stylesheets/components/chips.scss
new file mode 100644
index 0000000000..06748d27e0
--- /dev/null
+++ b/app/assets/stylesheets/components/chips.scss
@@ -0,0 +1,35 @@
+.chips-container div{
+    margin-right: 10px;
+}
+.chips-check-icon{
+    margin-left: 6px;
+    margin-right: 6px;
+    display: none;
+}
+
+.chips-container div label{
+    cursor: pointer;
+}
+.chips-container div label input[type="checkbox"]{
+    display: none;
+}
+.chips-container div label span{
+    position: relative;
+    display: inline-block;
+    background:white;
+    border: 0.5px solid #BDBDBD;
+    color: #a7a7a7;
+    padding: 8px;
+    border-radius: 5px;
+    font-size: 13px;
+    user-select: none;
+
+}
+.chips-container div label input[type="checkbox"]:checked ~ span{
+    border: 1px solid var(--primary-color);
+    color: var(--primary-color);
+}
+
+.chips-container div label input[type="checkbox"]:checked ~ span .chips-check-icon{
+    display:unset;
+}
diff --git a/app/assets/stylesheets/components/index.scss b/app/assets/stylesheets/components/index.scss
new file mode 100644
index 0000000000..c61d4d8dcc
--- /dev/null
+++ b/app/assets/stylesheets/components/index.scss
@@ -0,0 +1,2 @@
+@import 'chips';
+@import 'card_message'
\ No newline at end of file
diff --git a/app/assets/stylesheets/feedback.scss b/app/assets/stylesheets/feedback.scss
new file mode 100644
index 0000000000..51219d38ca
--- /dev/null
+++ b/app/assets/stylesheets/feedback.scss
@@ -0,0 +1,78 @@
+.feedback-email{
+    font-size: 12px;
+    color: #666666;
+    width: 363px;
+    margin-bottom: 21px;
+}
+.feedback-email a{
+    color: #76A7CC;
+    font-weight: 600;
+    text-decoration: none;
+}
+.feedback-text{
+    font-size: 12px;
+    color: #666666;
+    width: 363px;
+    margin-bottom: 0;
+}
+.feedback-text font{
+    font-weight: 600;
+    color: black;
+}
+.feedback-title{
+    font-size: 18px;
+    text-align: center;
+    font-weight: 700;
+}
+#feedback-title-line{
+    width: 128px;
+    margin: auto;
+    margin-bottom: 17px;
+    margin-top: 3px;
+    border: 0.5px solid var(--primary-color);
+    border-radius: 5px;
+}
+.feedback-input-title{
+    font-size: 12px;
+    color: #666666;
+    margin-bottom: 5px;
+    font-weight: 600;
+}
+.register-optional{
+    font-weight: 300;
+
+}
+.feedback-input{
+    width: 363px;
+    outline: none;
+    padding: 14px;
+    font-size: 15px;
+    font-weight: 500;
+    border: 1px solid #BDBDBD;
+    border-radius: 9px;
+    margin-bottom: 14px;
+    resize: none;
+}
+.feedback-input:focus{
+    border: 1px solid var(--primary-color);
+}
+.feedback-button{
+    margin-top: 10px;
+   width: 363px;
+   font-size: 16px;
+   color: white;
+   padding: 17px;
+   background-color: var(--primary-color);
+   border: none;
+   border-radius: 9px;
+}
+.feedback-button:hover{
+    background-color: var(--hover-color);
+    cursor: pointer;
+}
+.feedback-checks{
+    max-width: 363px;
+    margin: 0 auto;    
+    display: flex;
+    flex-wrap: wrap;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
new file mode 100644
index 0000000000..f2d68c91dc
--- /dev/null
+++ b/app/assets/stylesheets/login.scss
@@ -0,0 +1,64 @@
+.login-form{
+    margin-top: 30px;
+    padding: 37px 41px;
+    box-shadow: rgba(0, 0, 0, 0.08) 0px 20px 50px;
+    border-radius: 14px;
+}
+
+.login-input{
+    box-sizing: border-box;
+    outline: none;
+    padding: 19px;
+    font-size: 16px;
+    border: 1px solid #BDBDBD;
+    border-radius: 9px;
+    width: 357px;
+}
+
+.login-input:focus{
+    border: 1px solid var(--primary-color);
+}
+.login-input::placeholder{
+    font-weight: 300;
+    color: #C1C1C1;
+}
+
+.login-input-title{
+    font-size: 13px;
+    margin-bottom: 5px;
+    font-weight: 600;
+    color: #666666;
+}
+.email-input{
+    margin-bottom: 20px;
+}
+.password-input{
+    margin-bottom: 8px;
+}
+.login-forgot-password{
+    font-weight: 500 ;
+    text-align: end;
+    text-decoration:none;
+    font-size: 13px;
+}
+.login-button{
+    margin-top: 10px;
+   width: 357px;
+   font-size: 16px;
+   color: white;
+   padding: 17px;
+   background-color: var(--primary-color);
+   border: none;
+   border-radius: 9px;
+   margin-bottom: 20px;
+}
+.login-button:hover{
+    background-color: var(--hover-color);
+    cursor: pointer;
+}
+
+.dont-have-account{
+    font-size: 15px;
+    font-weight: 600;
+    text-align: center;
+}
diff --git a/app/assets/stylesheets/lostpassword.scss b/app/assets/stylesheets/lostpassword.scss
new file mode 100644
index 0000000000..2769eb7b05
--- /dev/null
+++ b/app/assets/stylesheets/lostpassword.scss
@@ -0,0 +1,69 @@
+.lost-password-form{
+    margin-top: 30px;
+    padding: 37px 41px;
+    box-shadow: rgba(0, 0, 0, 0.05) 0px 20px 50px;
+    border-radius: 14px;
+}
+.lost-password-arrowback{
+    all: none;
+}
+.lost-password-title{
+    font-size: 18px;
+    text-align: center;
+    font-weight: 700;
+}
+#lost-password-title-line{
+    width: 128px ;
+    margin: auto !important ;
+    margin-bottom: 14px !important ;
+    margin-top: 3px !important ;
+    border: 1px solid var(--primary-color) !important ;
+    border-radius: 5px ;
+}
+.lost-password-description{
+    color: #666666;
+    font-size: 12.5px;
+    margin-bottom: 14px;
+    width: 357px;
+}
+.lost-password-input{
+    box-sizing: border-box;
+    outline: none;
+    padding: 21px;
+    font-size: 16px;
+    border: 1px solid #BDBDBD;
+    border-radius: 9px;
+    width: 357px;
+    
+}
+.lost-password-input:focus{
+    border: 1px solid var(--primary-color);
+}
+.lost-password-input::placeholder{
+    font-weight: 300;
+    color: #C1C1C1;
+}
+
+.lost-password-input-title{
+    font-size: 13px;
+    margin-bottom: 5px;
+    font-weight: 600;
+    color: #666666;
+}
+.lost-password-button{
+    margin-top: 20px;
+   width: 357px;
+   font-size: 16px;
+   color: white;
+   padding: 21px;
+   background-color: var(--primary-color);
+   border: none;
+   border-radius: 9px;
+   margin-bottom: 20px;
+   display: block;
+}
+.lost-password-button:hover{
+    background-color: var(--hover-color);
+    cursor: pointer;
+}
+
diff --git a/app/assets/stylesheets/register.scss b/app/assets/stylesheets/register.scss
new file mode 100644
index 0000000000..fea9010eac
--- /dev/null
+++ b/app/assets/stylesheets/register.scss
@@ -0,0 +1,100 @@
+.register-form{
+    margin-top: 30px;
+    padding: 37px 41px;
+    box-shadow: rgba(0, 0, 0, 0.05) 0px 20px 50px;
+    border-radius: 14px;
+}
+.register-arrowback{
+    all: none;
+}
+.register-title{
+    font-size: 18px;
+    text-align: center;
+    font-weight: 700;
+}
+#register-title-line{
+    width: 128px;
+    margin: auto;
+    margin-bottom: 20px;
+    margin-top: 3px;
+    border: 0.5px solid #76A7CC;
+    border-radius: 5px;
+}
+
+.register-double-input{
+    display: flex;
+    margin-bottom: 14px;
+}
+.register-first-input{
+    margin-right: 19px;
+}
+
+.register-input-title{
+    font-size: 12px;
+    color: #666666;
+    margin-bottom: 5px;
+    font-weight: 600;
+}
+.register-optional{
+    font-weight: 300;
+}
+.register-input-long{
+    width: 363px;
+    outline: none;
+    padding: 14px;
+    font-size: 15px;
+    font-weight: 500;
+    border: 1px solid #BDBDBD;
+    border-radius: 9px;
+    margin-bottom: 14px;
+}
+.register-input-long:focus{
+    border: 1px solid #76A7CC;
+}
+
+.register-input-short{
+    width: 172px;
+    outline: none;
+    padding: 14px;
+    font-size: 15px;
+    font-weight: 500;
+    border: 1px solid #BDBDBD;
+    border-radius: 9px;
+}
+.register-input-short:focus{
+    border: 1px solid #76A7CC;
+}
+
+
+.register-input-icon{
+    position: absolute;
+    padding: 18px;
+    box-sizing: unset;
+}
+.register-input-with-icon{
+    padding-left: 45px;
+}
+#register-check-text{
+    margin-left: 10px;
+    color: #666666;
+    font-size: 12px;
+    font-weight: 400;
+    margin-bottom: 0;
+}
+
+.register-button{
+    margin-top: 20px;
+   width: 363px;
+   font-size: 16px;
+   color: white;
+   padding: 17px;
+   background-color: #76A7CC;
+   border: none;
+   border-radius: 9px;
+
+}
+
+.register-button:hover{
+    background-color: #6B96B7;
+    cursor: pointer;
+}
diff --git a/app/assets/stylesheets/search.scss b/app/assets/stylesheets/search.scss
index 40dc92dbe0..ab621fb364 100644
--- a/app/assets/stylesheets/search.scss
+++ b/app/assets/stylesheets/search.scss
@@ -182,3 +182,4 @@ div#search_categories_chzn .chzn-drop {
 #search_options #ontology_ontologyId_chosen .search-field:only-child input {
   width: 100% !important;
 }
+
diff --git a/app/assets/stylesheets/theme-variables.scss.erb b/app/assets/stylesheets/theme-variables.scss.erb
new file mode 100644
index 0000000000..aadb7f1a74
--- /dev/null
+++ b/app/assets/stylesheets/theme-variables.scss.erb
@@ -0,0 +1,30 @@
+<%# This file contains all the color themes of ontoportal alliance%>
+<% if (ui_theme = $UI_THEME.to_s.parameterize).present? && File.exists?(Rails.root.join('app', 'assets', 'stylesheets', 'themes', ui_theme)) 
+    case ui_theme
+    when "agroportal" %>
+        :root{
+            --primary-color: #31B404;
+            --hover-color: #40C811;
+            --secondary-color: #ffc107;
+        }
+    <% when "stageportal" %>
+        :root{
+            --primary-color: #76A7CC;
+            --hover-color: #6B96B7;
+            --secondary-color: #ffc107;
+        }
+    <% when "bioportal" %>
+        :root{
+            --primary-color: #76A7CC;
+            --hover-color: #31B404;
+            --secondary-color: #ffc107;
+        }
+    <% when "ontoportal" %>
+        :root{
+            --primary-color: #6E98A2;
+            --hover-color: #7BABB6;
+            --secondary-color: #ffc107;
+        }
+    <%# Here to add a new theme ... %>
+    <% end %>
+<% end %>
diff --git a/app/components/card_message_component.rb b/app/components/card_message_component.rb
new file mode 100644
index 0000000000..255372d5d2
--- /dev/null
+++ b/app/components/card_message_component.rb
@@ -0,0 +1,26 @@
+class CardMessageComponent < ViewComponent::Base
+    def initialize(title: nil ,message:, button_text: nil, type:)
+        @title = title
+        @message = message
+        @button_text = button_text
+        @type = type
+
+    end
+
+    def no_title?
+        @title.nil?
+    end
+
+    def no_button?
+        @button_text.nil?
+    end
+
+    def icon
+        case @type
+        when "success"
+            "green-check.svg"
+        when "failure"
+            "red-warning.svg"
+        end
+    end
+end
diff --git a/app/components/card_message_component/card_message_component.html.haml b/app/components/card_message_component/card_message_component.html.haml
new file mode 100644
index 0000000000..4eb55723a5
--- /dev/null
+++ b/app/components/card_message_component/card_message_component.html.haml
@@ -0,0 +1,20 @@
+.d-flex.justify-content-center.m-4
+  .card-message-card
+    .d-flex.justify-content-center.mb-4
+      %img{:src => "#{asset_path(icon)}"}/
+    - if no_title?
+      %p.card-message-text
+        = @message
+    - else
+      %h2.card-message-title
+        = @title
+      %p.card-message-text.card-message-has-title
+        = @message
+    - unless no_button?
+      - case @type
+      - when "success"
+        %a.card-message-button.card-message-button-success{:href => "/"}
+          = @button_text
+      - when "failure"
+        %a.card-message-button.card-message-button-failure{:href => "/"}
+          = @button_text
diff --git a/app/components/chips_component.rb b/app/components/chips_component.rb
new file mode 100644
index 0000000000..ced043f2ed
--- /dev/null
+++ b/app/components/chips_component.rb
@@ -0,0 +1,6 @@
+class ChipsComponent < ViewComponent::Base
+    def initialize(name:, value:)
+        @name = name
+        @value = value
+    end
+end
\ No newline at end of file
diff --git a/app/components/chips_component/chips_component.html.haml b/app/components/chips_component/chips_component.html.haml
new file mode 100644
index 0000000000..d495d32169
--- /dev/null
+++ b/app/components/chips_component/chips_component.html.haml
@@ -0,0 +1,7 @@
+.chips-container
+  %div
+    %label{:for => "chips-#{@name}-check"}
+      %input{:id => "chips-#{@name}-check", :name => @name, :type => "checkbox", :value => @value}/
+      %span
+        %img.chips-check-icon{:src => "#{asset_path('check.svg')}"}/
+        = @value
diff --git a/app/components/collapsable_block_component.rb b/app/components/collapsable_block_component.rb
new file mode 100644
index 0000000000..7941f2d960
--- /dev/null
+++ b/app/components/collapsable_block_component.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CollapsableBlockComponent < ViewComponent::Base
+  renders_one :header
+
+
+  def initialize(id: '', parent_id: '', collapsed: true, title: '')
+    super
+    @id = id
+    @collapsed = collapsed
+    @parent_id = parent_id
+    @title = title
+  end
+
+  def collapsed?
+    @collapsed
+  end
+
+  def collapsed_class
+    collapsed? ?  'collapsed' : 'show'
+  end
+end
diff --git a/app/components/collapsable_block_component/collapsable_block_component.html.haml b/app/components/collapsable_block_component/collapsable_block_component.html.haml
new file mode 100644
index 0000000000..1e58f8a27c
--- /dev/null
+++ b/app/components/collapsable_block_component/collapsable_block_component.html.haml
@@ -0,0 +1,7 @@
+- if content && !content.to_s.strip.empty?
+  %div.card
+    %div.card-header
+      %a.card-link{'data-toggle'=>'collapse', :href=>"##{@id}"}= @title || header
+    %div.collapse{id: @id, 'data-parent'=> "##{@parent_id}", class: collapsed_class}
+      %div.card-body
+        = content
\ No newline at end of file
diff --git a/app/components/concept_details_component.rb b/app/components/concept_details_component.rb
index f6a9269940..380427a3cb 100644
--- a/app/components/concept_details_component.rb
+++ b/app/components/concept_details_component.rb
@@ -16,12 +16,12 @@ def initialize(id:, acronym:, properties:, top_keys:, bottom_keys:, exclude_keys
     @exclude_keys = exclude_keys
     @id = id
 
-    @concept_properties = concept_properties2hash(@properties)
+    @concept_properties = concept_properties2hash(@properties) if @properties
   end
 
   def render_properties(properties_set, ontology_acronym, &block)
     out = ''
-    properties_set.each do |key, data|
+    properties_set&.each do |key, data|
       next if exclude_relation?(key) || !data[:values]
 
       values = data[:values]
@@ -49,14 +49,14 @@ def render_properties(properties_set, ontology_acronym, &block)
   end
 
   def properties_set_by_keys(keys, concept_properties, exclude_keys = [])
-    concept_properties.select do |k, v|
+    concept_properties&.select do |k, v|
       (keys.include?(k) || !keys.select { |key| v[:key].to_s.include?(key) }.empty?) && !exclude_keys.include?(k) &&
         exclude_keys.select { |key| v[:key].to_s.include?(key) }.empty?
     end
   end
 
   def filter_properties(top_keys, bottom_keys, exclude_keys, concept_properties)
-    all_keys = concept_properties.keys
+    all_keys = concept_properties&.keys || []
     top_set = properties_set_by_keys(top_keys, concept_properties, exclude_keys)
     bottom_set = properties_set_by_keys(bottom_keys, concept_properties, exclude_keys)
     leftover = properties_set_by_keys(all_keys - top_keys - bottom_keys, concept_properties, exclude_keys)
diff --git a/app/components/form_group_component.rb b/app/components/form_group_component.rb
new file mode 100644
index 0000000000..ea9c218115
--- /dev/null
+++ b/app/components/form_group_component.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class FormGroupComponent < ViewComponent::Base
+  include Turbo::FramesHelper
+  attr_reader :method_name, :value, :name
+  renders_one :help
+  renders_one :label
+  renders_one :input
+  renders_one :submit
+
+
+  def initialize(object:nil, name: '', method: nil, label: '', required: false, inline: true)
+    @object_name = object.class.name
+    @method_name = method || ''
+    begin
+      @value = object.send(method) if object && method
+    rescue
+      @value = ''
+    end
+    @label_text = label && !label.empty? ? label : method.to_s.capitalize
+    @required = required
+    @name = name && !name.empty? ? name : @object_name
+    @inline = inline
+  end
+
+
+  def required?
+    @required
+  end
+
+  def inline_label?
+    @inline
+  end
+
+  def label_class
+    inline_label? ? 'col-sm-4' : ''
+  end
+  def content_class
+    inline_label? ? 'col-sm-8' : ''
+  end
+  def container_class
+    inline_label? ? 'row' : ''
+  end
+  def container_id
+    "#{@name}#{@method_name.capitalize}"
+  end
+end
diff --git a/app/components/form_group_component/form_group_component.html.haml b/app/components/form_group_component/form_group_component.html.haml
new file mode 100644
index 0000000000..8b3d1c7357
--- /dev/null
+++ b/app/components/form_group_component/form_group_component.html.haml
@@ -0,0 +1,23 @@
+%div.form-group{id: container_id, class: container_class, style: 'align-items: baseline'}
+  %div{class: label_class}
+    - if label?
+      = label
+    - elsif @label_text
+      %label{for: "#{@name}_#{@method_name}", }
+        = @label_text
+    - if required?
+      %span.asterik *
+  %div{class: content_class}
+    = render TurboFrameComponent.new(id: "#{container_id}_from_group_input") do
+      %div.d-flex.w-100
+        %div.flex-grow-1.mr-1
+          - if input?
+            = input
+          - else
+            = content
+          - if help?
+            %small.form-text.text-muted{id: "#{@name}_#{@method_name}_helpBlock"}
+              = help
+        - if submit?
+          %div.d-flex
+            = submit
\ No newline at end of file
diff --git a/app/components/loader_component.rb b/app/components/loader_component.rb
new file mode 100644
index 0000000000..493b76dbd5
--- /dev/null
+++ b/app/components/loader_component.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class LoaderComponent < ViewComponent::Base
+  include ActionView::Helpers::TagHelper
+
+  def call
+    content_tag(:div, class: 'd-flex align-items-center flex-column') do
+      content_tag(:div, class:'spinner-border') do
+        content_tag(:span) do
+          'Loading'
+        end
+        content_tag(:div, class: 'spinner-text my-2') do
+          'Loading'
+        end
+      end
+    end
+  end
+
+end
diff --git a/app/components/metadata_selector_component.rb b/app/components/metadata_selector_component.rb
new file mode 100644
index 0000000000..70c4112099
--- /dev/null
+++ b/app/components/metadata_selector_component.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class MetadataSelectorComponent < ViewComponent::Base
+
+  include ActionView::Helpers::FormOptionsHelper
+
+  def initialize(label: 'Select properties', selected:, values:, inline: false, multiple: true)
+    super
+    @label = label
+    @selected_values = selected
+    @metadata_data = values
+    @inline = inline
+    @multiple = multiple
+  end
+
+  def options_data
+    options_for_select(@metadata_data, selected: @selected_values)
+  end
+end
diff --git a/app/components/metadata_selector_component/metadata_selector_component.html.haml b/app/components/metadata_selector_component/metadata_selector_component.html.haml
new file mode 100644
index 0000000000..15c1c5a84c
--- /dev/null
+++ b/app/components/metadata_selector_component/metadata_selector_component.html.haml
@@ -0,0 +1,2 @@
+= render FormGroupComponent.new(object:nil, name: :search, method: :metadata, label: @label, inline: @inline) do
+  = select(:search, :metadata, options_data, {}, style:'width:100%', multiple: @multiple, data: {controller:'metadata-select'})
\ No newline at end of file
diff --git a/app/components/metadata_selector_component/metadata_selector_component_controller.js b/app/components/metadata_selector_component/metadata_selector_component_controller.js
new file mode 100644
index 0000000000..59750c57a7
--- /dev/null
+++ b/app/components/metadata_selector_component/metadata_selector_component_controller.js
@@ -0,0 +1,15 @@
+import {Controller} from "@hotwired/stimulus";
+import {useChosen} from "../../javascript/mixins/useChosen";
+
+export default class extends Controller {
+    connect() {
+        useChosen(this.element, {
+            search_contains: true,
+            width: "100%"
+        }, this.#triggerChange.bind(this))
+    }
+
+    #triggerChange() {
+        document.dispatchEvent(new Event('change', {target: this.element}))
+    }
+}
diff --git a/app/components/nested_form_inputs_component.rb b/app/components/nested_form_inputs_component.rb
new file mode 100644
index 0000000000..880cfe91d1
--- /dev/null
+++ b/app/components/nested_form_inputs_component.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class NestedFormInputsComponent < ViewComponent::Base
+
+  renders_one :template
+  renders_many :rows
+end
diff --git a/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml
new file mode 100644
index 0000000000..9862842312
--- /dev/null
+++ b/app/components/nested_form_inputs_component/nested_form_inputs_component.html.haml
@@ -0,0 +1,21 @@
+%div{data: {controller: "nested-form"}}
+  %template{'data-nested-form-target':"template"}
+    %div.d-flex.align-items-center.nested-form-wrapper{'data-new-record': 'true'}
+      %div{style: 'width: 90%'}
+        = template
+      %div.d-flex.justify-content-end{style: 'width: 10%'}
+        %button.btn.btn-danger{data: {action:"nested-form#remove"}}
+          %i.fas.fa-minus.fa-lg
+  - rows.each_with_index  do |row , index|
+    %div.d-flex.align-items-center.nested-form-wrapper{'data-new-record': 'true'}
+      %div{style: 'width: 90%'}
+        = row
+      %div.d-flex.justify-content-end{style: 'width: 10%'}
+        - unless index == 0
+          %button.btn.btn-danger{data: {action:"nested-form#remove"}}
+            %i.fas.fa-minus.fa-lg
+
+  %div{'data-nested-form-target': "target"}
+  %div.float-right
+    %button.btn.btn-success{data: {action:"nested-form#add"}}
+      %i.fas.fa-plus.fa-lg
\ No newline at end of file
diff --git a/app/components/ontology_subscribe_button_component.rb b/app/components/ontology_subscribe_button_component.rb
new file mode 100644
index 0000000000..282c569a37
--- /dev/null
+++ b/app/components/ontology_subscribe_button_component.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class OntologySubscribeButtonComponent < ViewComponent::Base
+  def initialize(ontology_id: , subscribed: , user_id:)
+    super
+    @sub_text = subscribed ? "Unsubscribe" : "Subscribe"
+    @controller_params =  {
+      data: {
+        controller: 'subscribe-notes',
+        'subscribe-notes-ontology-id-value':  ontology_id,
+        'subscribe-notes-is-subbed-value': subscribed.to_s,
+        'subscribe-notes-user-id-value':  user_id,
+        action: 'click->subscribe-notes#subscribeToNotes'
+      }
+    }
+  end
+end
diff --git a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml
new file mode 100644
index 0000000000..6eb97097e6
--- /dev/null
+++ b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component.html.haml
@@ -0,0 +1,6 @@
+%span{@controller_params}
+  %a.subscribe_to_notes.btn.btn-primary{href:'javascript:void(0);'}
+    #{@sub_text} to notes emails
+  %span{style:"display: none;", 'data-subscribe-notes-target': 'loader'}
+    = image_tag("spinners/spinner_000000_16px.gif", style: "vertical-align: text-bottom; background: transparent")
+  %span.notes_sub_error{style:'color: red; display: none', 'data-subscribe-notes-target': 'error'}
\ No newline at end of file
diff --git a/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js
new file mode 100644
index 0000000000..99b8e190f8
--- /dev/null
+++ b/app/components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller.js
@@ -0,0 +1,64 @@
+import {Controller} from "@hotwired/stimulus";
+import useAjax from "../../javascript/mixins/useAjax";
+
+// Connects to data-controller="subscribe-notes"
+export default class extends Controller {
+    static values = {
+        ontologyId: String,
+        isSubbed: Boolean,
+        userId: String
+    }
+    static targets = ["error", "loader"]
+
+    subscribeToNotes() {
+        let ontologyId = this.ontologyIdValue
+        let isSubbed = this.isSubbedValue
+        let userId = this.userIdValue
+
+        this.#hideError()
+        this.#showSpinner()
+
+        let url = "/subscriptions?user_id=" + userId + "&ontology_id=" + ontologyId + "&subbed=" + isSubbed;
+        useAjax({
+            type: "POST",
+            url: url,
+            dataType: "json",
+            success: () => {
+                // Change subbed value on a element
+                this.#hideSpinner()
+                let linkElement = $(this.element);
+                this.isSubbedValue = !isSubbed
+
+                // Change button text
+                let txt = linkElement.html();
+                let newButtonText = txt.match("Unsubscribe") ? txt.replace("Unsubscribe", "Subscribe") : txt.replace("Subscribe", "Unsubscribe");
+                linkElement.html(newButtonText);
+            },
+            error: () => {
+                this.#hideSpinner()
+                this.#showError()
+            }
+        })
+    }
+
+    #showSpinner() {
+        $(this.loaderTarget).show()
+    }
+
+    #hideSpinner() {
+        $(this.loaderTarget).hide()
+    }
+
+
+    #showError() {
+        const errorElem = $(this.errorTarget)
+        errorElem.html("Problem subscribing to emails, please try again")
+        errorElem.show()
+    }
+
+    #hideError() {
+        $(this.errorTarget).hide()
+    }
+
+
+}
diff --git a/app/components/select_input_component.rb b/app/components/select_input_component.rb
new file mode 100644
index 0000000000..872f7f41ee
--- /dev/null
+++ b/app/components/select_input_component.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class SelectInputComponent < ViewComponent::Base
+
+  def initialize(id:, name:, values:, selected:, multiple: false)
+    super
+    @id = id
+    @name = name
+    @values = values
+    @selected = selected
+    @multiple = multiple
+  end
+
+  def options_values
+    if @selected.nil? || @selected.empty?
+      @selected = 0
+      @values.unshift('')
+    end
+    options_for_select(@values, @selected)
+  end
+end
diff --git a/app/components/select_input_component/select_input_component.html.haml b/app/components/select_input_component/select_input_component.html.haml
new file mode 100644
index 0000000000..2a9f7692cd
--- /dev/null
+++ b/app/components/select_input_component/select_input_component.html.haml
@@ -0,0 +1,10 @@
+%div{:data => { controller: "select-input", 'select-input': {'multiple-value': @multiple.to_s}}}
+  = select_tag(@name, options_values, { multiple: @multiple, class: "form-control", id: "select_#{@id}", data: { action: "select-input#toggleOtherValue", "select-input-target": "selectedValues" } })
+
+  %div.d-flex.mt-1
+    = text_field_tag("add_#{@id}", nil, :style => "margin-right: 1em;width: 16em;display: none;", :placeholder => "Or provide the value",
+    data: {action: "keydown.enter->select-input#addValue",  "select-input-target": "inputValueField"}, class: 'metadataInput form-control form-control-sm')
+
+    %button.btn.btn-primary.btn-sm.add-value-btn{id: "btnAdd#{@id}", style: "display: none;",
+     data: { action: "select-input#addValue", "select-input-target": "btnValueField"}}
+      Add new value
\ No newline at end of file
diff --git a/app/components/select_input_component/select_input_component_controller.js b/app/components/select_input_component/select_input_component_controller.js
new file mode 100644
index 0000000000..7fb94e380a
--- /dev/null
+++ b/app/components/select_input_component/select_input_component_controller.js
@@ -0,0 +1,137 @@
+import {Controller} from "@hotwired/stimulus"
+import {useChosen} from "../../javascript/mixins/useChosen";
+
+export default class extends Controller {
+
+    static values = {
+        other: {type: Boolean, default: true},
+        multiple: {type: Boolean, default: false}
+    }
+
+    static targets = ["btnValueField", "inputValueField", "selectedValues"]
+
+    connect() {
+        this.initMultipleSelect()
+        this.#displayOtherValueField()
+    }
+
+    toggleOtherValue() {
+        if (this.otherValue && !this.multipleValue) {
+            this.#toggle()
+        }
+    }
+
+    addValue(event) {
+        event.preventDefault()
+
+        if (this.inputValueFieldTarget.value) {
+            let newOption = this.inputValueFieldTarget.value;
+            this.#addNewOption(newOption)
+            this.#selectNewOption(newOption)
+            if (!this.multipleValue) {
+                this.#hideOtherValueField()
+            }
+        }
+    }
+
+
+    initMultipleSelect() {
+        this.#addEmptyOption()
+        useChosen(this.selectedValuesTarget, {
+            width: '100%',
+            search_contains: true,
+            allow_single_deselect: !this.multipleValue,
+        }, (event) => {
+            if(this.multipleValue){
+                let selected = event.target.selectedOptions
+                if (selected.length === 0) {
+                    this.#selectEmptyOption()
+                } else {
+                    this.#unSelectEmptyOption()
+                }
+            }
+        })
+    }
+
+    #selectEmptyOption() {
+        this.emptyOption.selected = true
+        this.emptyOption.disabled = false
+    }
+
+    #unSelectEmptyOption() {
+        this.emptyOption.selected = false
+        this.emptyOption.disabled = true
+    }
+
+    #addEmptyOption() {
+        this.emptyOption = document.createElement("option")
+        this.emptyOption.innerHTML = ''
+        this.emptyOption.value = ''
+        this.selectedValuesTarget.prepend(this.emptyOption)
+    }
+
+    #selectNewOption(newOption) {
+        let selectedOptions = this.#selectedOptions();
+
+
+        if (Array.isArray(selectedOptions)) {
+            selectedOptions.push(newOption);
+        } else {
+            selectedOptions = [];
+            selectedOptions.push(newOption)
+        }
+
+        this.selectedValuesTarget.value = selectedOptions
+        if (this.multipleValue) {
+            const options = this.selectedValuesTarget.options
+            for (const element of options) {
+                element.selected = selectedOptions.indexOf(element.value) >= 0;
+            }
+            jQuery(this.selectedValuesTarget).trigger("chosen:updated")
+        }
+
+    }
+
+    #addNewOption(newOption) {
+        let option = document.createElement("option");
+        option.value = newOption;
+        option.text = newOption;
+        this.selectedValuesTarget.add(option)
+    }
+
+    #selectedOptions() {
+        if (this.multipleValue) {
+            const selectedOptions = [];
+            for (let option of this.selectedValuesTarget.options) {
+                if (option.selected) {
+                    selectedOptions.push(option.value);
+                }
+            }
+            return selectedOptions
+        } else {
+            return this.selectedValuesTarget.value
+        }
+    }
+
+    #toggle() {
+        if (this.selectedValuesTarget.value === 'other') {
+            this.#displayOtherValueField()
+        } else {
+            this.#hideOtherValueField()
+        }
+    }
+
+    #displayOtherValueField() {
+        this.inputValueFieldTarget.value = ""
+        this.btnValueFieldTarget.style.display = 'block'
+        this.inputValueFieldTarget.style.display = 'block'
+    }
+
+    #hideOtherValueField() {
+        this.inputValueFieldTarget.value = ""
+        this.btnValueFieldTarget.style.display = 'none'
+        this.inputValueFieldTarget.style.display = 'none'
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/components/switch_input_component.rb b/app/components/switch_input_component.rb
new file mode 100644
index 0000000000..e8ba664312
--- /dev/null
+++ b/app/components/switch_input_component.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class SwitchInputComponent < ViewComponent::Base
+
+
+  def initialize(id:, name: , label: nil, value: '', checked: false, boolean_switch: false)
+    super
+    @id = id
+    @name = name
+    @label = label
+    @value = value.nil? || value.empty? ? @name : value
+    @checked = checked
+    @boolean_switch = boolean_switch
+  end
+
+  def boolean_switch_action
+    "this.previousElementSibling.value = this.previousElementSibling.value !== 'true'" if @boolean_switch
+  end
+
+  def check_box_name
+    @name unless @boolean_switch
+  end
+
+  def check_box_id
+    @boolean_switch ? @id +"_checkbox" :@id
+  end
+end
diff --git a/app/components/switch_input_component/switch_input_component.html.haml b/app/components/switch_input_component/switch_input_component.html.haml
new file mode 100644
index 0000000000..1f74a7c247
--- /dev/null
+++ b/app/components/switch_input_component/switch_input_component.html.haml
@@ -0,0 +1,6 @@
+%div.custom-control.custom-switch
+  - if @boolean_switch
+    = hidden_field_tag @name, @value
+  = check_box_tag  check_box_name, @value, @checked, class: 'custom-control-input', id:  check_box_id, onChange: "#{boolean_switch_action}"
+  %label.custom-control-label{for: check_box_id}
+    = content || @label
\ No newline at end of file
diff --git a/app/components/text_field_component.rb b/app/components/text_field_component.rb
new file mode 100644
index 0000000000..63fe0c2426
--- /dev/null
+++ b/app/components/text_field_component.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class TextFieldComponent < FormGroupComponent
+
+  def initialize(object:, name: nil, method:, label: nil, required: false, inline: true)
+    super
+    @object = object
+  end
+end
diff --git a/app/components/text_field_component/text_field_component.html.haml b/app/components/text_field_component/text_field_component.html.haml
new file mode 100644
index 0000000000..9b9c8e6867
--- /dev/null
+++ b/app/components/text_field_component/text_field_component.html.haml
@@ -0,0 +1,7 @@
+= render FormGroupComponent.new(object: @object, name: @name, method: @method_name, label: @label_text, inline: @inline) do |c|
+  = text_field c.name, c.method_name , value: c.value, class: "form-control"
+  - c.help do
+    = help
+  - if submit?
+    - c.submit do
+      = submit
\ No newline at end of file
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 a1178d035e..acedbda10a 100644
--- a/app/components/turbo_frame_component/turbo_frame_component.html.haml
+++ b/app/components/turbo_frame_component/turbo_frame_component.html.haml
@@ -4,6 +4,6 @@
       = content
   %div.show-if-loading.my-auto.mx-auto
     %div.p-3
-      = render partial: 'shared/ui-component/loader'
+      = render LoaderComponent.new
   %div{'data-turbo-frame-error-target': 'errorMessage', style:'display: none; width: 100%'}
     = render AlertMessageComponent.new(id: "#{@id}_error-message", type:'danger')
\ No newline at end of file
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index ded2faf249..cdc26fc299 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -1,4 +1,5 @@
 class AdminController < ApplicationController
+  include TurboHelper
   layout :determine_layout
   before_action :cache_setup
 
@@ -180,21 +181,19 @@ def delete_ontologies
   end
 
   def delete_submission
-    response = {errors: '', success: ''}
-
+    response = { errors: '', success: '' }
+    submission_id = params["id"]
     begin
       ont = params["acronym"]
       ontology = LinkedData::Client::Models::Ontology.find_by_acronym(ont).first
 
       if ontology
-        submissions = ontology.explore.submissions
-        submission = submissions.select {|o| o.submissionId == params["id"].to_i}.first
+        submission = ontology.explore.submissions({ display: 'submissionId' }, submission_id)
 
         if submission
           error_response = submission.delete
-
           if response_error?(error_response)
-            errors = response_errors(error_response) # see application_controller::response_errors
+            errors = response_errors(error_response)
             _process_errors(errors, response, true)
           else
             response[:success] << "Submission #{params["id"]} for ontology #{ont} was deleted successfully"
@@ -208,14 +207,25 @@ def delete_submission
     rescue Exception => e
       response[:errors] << "Problem deleting submission #{params["id"]} for ontology #{ont} - #{e.class}: #{e.message}"
     end
-    render :json => response
+
+    if params[:turbo_stream]
+      if response[:errors].empty?
+        render_turbo_stream( alert_success { response[:success] }, remove('submission_' + submission_id.to_s))
+
+      else
+        render_turbo_stream alert_error { response[:errors] }
+      end
+    else
+      render :json => response
+    end
+
   end
 
   def users
     response = _users
     render :json => response
   end
-
+  
 
   private
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index de6e8df2bb..20c34ccfb3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -30,14 +30,13 @@ class ApplicationController < ActionController::Base
   EXPIRY_ONTOLOGY_SIMPLIFIED = 60 * 1  #  0:01 minute
 
 
-  $DATA_CATALOG_VALUES = {"https://biosharing.org/" => "BioSharing",
-                         "http://aber-owl.net/ontology/" => "AberOWL",
-                         "http://vest.agrisemantics.org/content/" => "VEST Registry",
-                         "http://bioportal.bioontology.org/ontologies/" => "BioPortal",
-                         "https://bioportal.bioontology.org/ontologies/" => "BioPortal",
-                         "http://www.ontobee.org/ontology/" => "Ontobee",
-                         "http://www.obofoundry.org/ontology/" => "The OBO Foundry",
-                         "http://www.ebi.ac.uk/ols/ontologies/" => "EBI Ontology Lookup"}
+  $DATA_CATALOG_VALUES = {"fairsharing.org/" => "FAIRsharing",
+                         "aber-owl.net" => "AberOWL",
+                         "vest.agrisemantics.org" => "VEST Registry",
+                         "bioportal.bioontology.org" => "BioPortal",
+                         "ontobee.org" => "Ontobee",
+                         "obofoundry.org" => "The OBO Foundry",
+                         "ebi.ac.uk/ols" => "EBI Ontology Lookup"}
 
   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#",
                        :rdf => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", :rdfs => "http://www.w3.org/2000/01/rdf-schema#", :metadata => "http://data.bioontology.org/metadata/",
@@ -218,6 +217,7 @@ def parse_response_body(response)
 
   def response_errors(error_response)
     error_struct = parse_response_body(error_response)
+
     errors = {error: "There was an error, please try again"}
     return errors unless error_struct
     return errors unless error_struct.respond_to?(:errors)
@@ -360,6 +360,10 @@ def current_user_admin?
     session[:user] && session[:user].admin?
   end
 
+  def ontology_restricted?(acronym)
+    restrict_downloads = $NOT_DOWNLOADABLE
+    restrict_downloads.include? acronym
+  end
   # updates the 'history' tab with the current selected concept
   def update_tab(ontology, concept)
     array = session[:ontologies] || []
diff --git a/app/controllers/concerns/submission_updater.rb b/app/controllers/concerns/submission_updater.rb
new file mode 100644
index 0000000000..39210c50c5
--- /dev/null
+++ b/app/controllers/concerns/submission_updater.rb
@@ -0,0 +1,104 @@
+module SubmissionUpdater
+  extend ActiveSupport::Concern
+
+  def save_submission(new_submission_hash)
+    convert_values_to_types(new_submission_hash)
+
+    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(new_submission_hash[:ontology]).first
+    @submission = LinkedData::Client::Models::OntologySubmission.new(values: submission_params(new_submission_hash))
+
+    update_ontology_summary_only
+    @submission.save
+  end
+
+  def update_submission(new_submission_hash)
+
+    convert_values_to_types(new_submission_hash)
+
+    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(new_submission_hash[:ontology]).first
+    @submission = @ontology.explore.submissions({ display: 'all' }, new_submission_hash[:id])
+
+    @submission.update_from_params(submission_params(new_submission_hash))
+
+    update_ontology_summary_only
+    @submission.update(cache_refresh_all: false)
+  end
+
+  private
+
+  def update_ontology_summary_only
+    @ontology.summaryOnly = @submission.isRemote.eql?('3')
+    @ontology.update
+  end
+
+  def convert_values_to_types(new_submission_hash)
+    unless new_submission_hash[:contact].nil?
+      new_submission_hash[:contact] = new_submission_hash[:contact].values
+      new_submission_hash[:contact].delete_if { |c| c[:name].empty? || c[:email].empty? }
+    end
+
+    # Convert metadata that needs to be integer to int
+    @metadata.map do |hash|
+      if hash["enforce"].include?("integer")
+        if !new_submission_hash[hash["attribute"]].nil? && !new_submission_hash[hash["attribute"]].eql?("")
+          new_submission_hash[hash["attribute"].to_s.to_sym] = Integer(new_submission_hash[hash["attribute"].to_s.to_sym])
+        end
+      end
+      if hash["enforce"].include?("boolean") && !new_submission_hash[hash["attribute"]].nil?
+        if new_submission_hash[hash["attribute"]].eql?("true")
+          new_submission_hash[hash["attribute"].to_s.to_sym] = true
+        elsif new_submission_hash[hash["attribute"]].eql?("false")
+          new_submission_hash[hash["attribute"].to_s.to_sym] = false
+        else
+          new_submission_hash[hash["attribute"].to_s.to_sym] = nil
+        end
+      end
+    end
+  end
+
+
+  def submission_params(params)
+    attributes = [
+      :ontology,
+      :description,
+      :hasOntologyLanguage,
+      :prefLabelProperty,
+      :synonymProperty,
+      :definitionProperty,
+      :authorProperty,
+      :obsoleteProperty,
+      :obsoleteParent,
+      :version,
+      :status,
+      :released,
+      :isRemote,
+      :pullLocation,
+      :filePath,
+      { contact: [:name, :email] },
+      :homepage,
+      :documentation,
+      :publication
+    ]
+
+    @metadata.each do |m|
+
+      m_attr = m["attribute"].to_sym
+
+      attributes << if m["enforce"].include?("list")
+                      [{ m_attr => {} }, { m_attr => []}]
+                    else
+                      m_attr
+                    end
+    end
+    p = params.permit(attributes.uniq)
+    p.to_h.transform_values do |v|
+      if v.is_a? Hash
+        v.values.reject(&:empty?)
+      elsif v.is_a? Array
+        v.reject(&:empty?)
+      else
+        v
+      end
+    end
+  end
+end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 23d51ffdfa..2c7b8065c4 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -89,10 +89,24 @@ def feedback
     # If sim_submit is nil, we know the form hasn't been submitted and we should
     # bypass form processing.
     if params[:sim_submit].nil?
-      render layout: feedback_layout
+      render 'home/feedback/feedback', layout: feedback_layout
       return
     end
 
+    @tags = []
+    unless params[:bug].nil? || params[:bug].empty?
+      @tags << "Bug"
+    end
+    unless params[:proposition].nil? || params[:proposition].empty?
+      @tags << "Proposition"
+    end
+    unless params[:question].nil? || params[:question].empty?
+      @tags << "Question"
+    end
+    unless params[:ontology_submissions_request].nil? || params[:bug].empty?
+      @tags << "Ontology submissions request"
+    end
+
     @errors = []
 
     if params[:name].nil? || params[:name].empty?
@@ -111,14 +125,14 @@ def feedback
     end
 
     unless @errors.empty?
-      render layout: feedback_layout
+      render render 'home/feedback/feedback', layout: feedback_layout
       return
     end
 
-    Notifier.feedback(params[:name], params[:email], params[:comment], params[:location]).deliver_now
+    Notifier.feedback(params[:name], params[:email], params[:comment], params[:location], @tags).deliver_later
 
     if params[:pop].eql?('true')
-      render 'feedback_complete', layout: 'popup'
+      render 'home/feedback/feedback_complete', layout: 'popup'
     else
       flash[:notice] = 'Feedback has been sent'
       redirect_to_home
diff --git a/app/controllers/landscape_controller.rb b/app/controllers/landscape_controller.rb
index 420f698577..c3f81dc9a8 100644
--- a/app/controllers/landscape_controller.rb
+++ b/app/controllers/landscape_controller.rb
@@ -92,7 +92,7 @@ def index
     data_catalog_submissions.each do |catalog_sub|
       catalog_sub.includedInDataCatalog.each do |data_catalog|
         $DATA_CATALOG_VALUES.each do |uri, name|
-          if data_catalog.start_with?(uri)
+          if data_catalog[uri]
             dataCatalog_count_hash[name] += 1
           end
         end
diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
index 2a9587268a..bae1768519 100755
--- a/app/controllers/login_controller.rb
+++ b/app/controllers/login_controller.rb
@@ -75,6 +75,10 @@ def destroy
   def lost_password
   end
 
+  def lost_password_success
+  end
+
+
   # Sends a new password to the user
   def send_pass
     username = params[:user][:account_name]
@@ -82,7 +86,7 @@ def send_pass
     resp = LinkedData::Client::HTTP.post("/users/create_reset_password_token", {username: username, email: email})
 
     if resp.nil?
-      redirect_to login_index_path, notice: "Please check your email for a message with reset instructions"
+      redirect_to "/lost_pass_success"
     else
       flash[:notice] = resp.errors.first + ". Please try again."
       redirect_to "/lost_pass"
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index b8ec4390c8..83051c4e1c 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,6 +1,11 @@
 class NotesController < ApplicationController
-
+  include TurboHelper
   layout 'ontology'
+  NOTES_PROPOSAL_TYPES = {
+    ProposalNewClass: "New Class Proposal",
+    ProposalChangeHierarchy: "New Relationship Proposal",
+    ProposalChangeProperty: "Change Property Value Proposal"
+  }
 
   def show
     id = clean_note_id(params[:id])
@@ -12,10 +17,24 @@ def show
       render :partial => 'thread'
       return
     end
+  end
 
-    respond_to do |format|
-      format.html { render :template => 'notes/show' }
-    end
+  def new_comment
+    render partial: 'new_comment', locals: { parent_id: params[:parent_id], type: params[:parent_type],
+                                             user_id: session[:user].id, ontology_id: params[:ontology_id] }
+  end
+
+  def new_proposal
+    types = NOTES_PROPOSAL_TYPES.map { |x, y| [y, x.to_s] }
+    render partial: 'new_proposal', locals: { parent_id: params[:parent_id], type: params[:proposal_type],
+                                              parent_type: params[:parent_type], user_id: session[:user].id,
+                                              ontology_id: params[:ontology_id], types: types }
+  end
+
+  def new_reply
+    render 'notes/reply/new', locals: { frame_id: "#{params[:parent_id]}_new_reply",
+                                           parent_id: params[:parent_id], type: 'reply',
+                                           user_id: session[:user].id }
   end
 
   def virtual_show
@@ -46,56 +65,82 @@ def virtual_show
       return
     end
 
-    respond_to do |format|
-      format.html { render :show }
+    render 'notes/show', layout: false
     end
-  end
 
   def create
     if params[:type].eql?("reply")
       note = LinkedData::Client::Models::Reply.new(values: note_params)
-    elsif params[:type].eql?("ontology")
-      params[:relatedOntology] = [params.delete(:parent)]
-      note = LinkedData::Client::Models::Note.new(values: note_params)
-    elsif params[:type].eql?("class")
-      params[:relatedClass] = [params.delete(:parent)]
-      params[:relatedOntology] = params[:relatedClass].map {|c| c["ontology"]}
-      note = LinkedData::Client::Models::Note.new(values: note_params)
+      new_note = note.save
+      success_message = ''
+      locals =  { note: new_note, parent_id: params[:parent]}
+      partial = 'notes/reply/reply'
+      container_id = "#{params[:parent]}_thread_replay_container"
+      alerts_container_id = "#{params[:parent]}_reply"
     else
+      if params[:proposal]
+        cast_to_list = [:synonym, :definition, :newRelationshipType]
+        cast_to_list.each do |property|
+          params[:proposal][property] = params[:proposal][property].split(',') if params[:proposal][property]
+        end
+        params[:subject] = "#{NOTES_PROPOSAL_TYPES[params[:proposal][:type].to_sym]}: #{params[:proposal][:reasonForChange]}"
+      end
+
+      if params[:type].eql?("ontology")
+        params[:relatedOntology] = [params.delete(:parent)]
+
+      elsif params[:type].eql?("class")
+        related_class = params.delete(:parent)
+        ontology_id = params.delete(:ontology_id)
+        params[:relatedClass] = [{ ontology: ontology_id, class: related_class }]
+        params[:relatedOntology] = [ontology_id]
+      end
+
       note = LinkedData::Client::Models::Note.new(values: note_params)
+      new_note = note.save
+      parent_type = params[:type].eql?("ontology") ? 'ontology' : 'class'
+      ontology_acronym = new_note.relatedOntology.first.split('/').last
+      success_message = 'New comment added successfully'
+      locals =  { note: new_note, ontology_acronym: ontology_acronym, parent_type: parent_type }
+      partial = 'notes/note_line'
+      container_id = "#{parent_type}_notes_table_content"
+      alerts_container_id = nil
     end
 
-    new_note = note.save
 
     if new_note.errors
-      render :json => new_note.errors, :status => 500
-      return
-    end
+      render_turbo_stream alert_error(id: alerts_container_id) { response_errors(new_note).to_s }
+    else
+      streams = [prepend(container_id, partial: partial, locals: locals)]
+      streams.unshift(alert_success { success_message }) unless params[:type].eql?("reply")
 
-    unless new_note.nil?
-      render :json => new_note.to_hash.to_json
+      render_turbo_stream *streams
     end
   end
 
   def destroy
-    note_ids = params[:noteids].kind_of?(String) ? params[:noteids].split(",") : params[:noteids]
-
-    ontology = DataAccess.getOntology(params[:ontologyid])
-
-    errors = []
-    successes = []
-    note_ids.each do |note_id|
-      begin
-        result = DataAccess.deleteNote(note_id, ontology.ontologyId, params[:concept_id])
-        raise Exception if !result.nil? && result["errorCode"]
-      rescue Exception => e
-        errors << note_id
-        next
+    note_id = params[:noteid]
+    note = LinkedData::Client::Models::Note.get(note_id)
+    response = {}
+    if note
+      note.delete
+
+      if note.errors
+        response[:errors] = note.errors
+      else
+        response[:success] = "Note #{note_id}  was deleted successfully"
       end
-      successes << note_id
+    else
+      response[:errors] = "Note #{note_id}  was not found in the system"
+    end
+    parent_type = params[:parent_type]
+    alerts_container_id = "notes_#{parent_type}_list_table_alerts"
+    if response[:errors]
+      render_turbo_stream alert_error(id: alerts_container_id) { response[:errors].join(',').to_s }
+    else
+      render_turbo_stream(alert_success(id: alerts_container_id) { response[:success] }, remove("#{note_id}_tr_#{parent_type}"))
     end
 
-    render :json => { :success => successes, :error => errors }
   end
 
   def archive
diff --git a/app/controllers/ontologies_controller.rb b/app/controllers/ontologies_controller.rb
index 65649e62cc..12035ac7fc 100644
--- a/app/controllers/ontologies_controller.rb
+++ b/app/controllers/ontologies_controller.rb
@@ -39,7 +39,7 @@ def index
 
     # The attributes used when retrieving the submission. We are not retrieving all attributes to be faster
     browse_attributes = 'ontology,acronym,submissionStatus,description,pullLocation,creationDate,released,name,naturalLanguage,hasOntologyLanguage,hasFormalityLevel,isOfType,contact'
-    submissions = LinkedData::Client::Models::OntologySubmission.all(include_views: true, display_links: false, 
+    submissions = LinkedData::Client::Models::OntologySubmission.all(include_views: true, display_links: false,
 display_context: false, include: browse_attributes)
     submissions_map = Hash[submissions.map {|sub| [sub.ontology.acronym, sub] }]
 
@@ -236,7 +236,7 @@ def mappings
 
   def new
     @ontology = LinkedData::Client::Models::Ontology.new
-    @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true, 
+    @ontologies = LinkedData::Client::Models::Ontology.all(include: 'acronym', include_views: true,
 display_links: false, display_context: false)
     @categories = LinkedData::Client::Models::Category.all
     @groups = LinkedData::Client::Models::Group.all
@@ -292,15 +292,16 @@ def collections
   # GET /ontologies/ACRONYM
   # GET /ontologies/1.xml
   def show
+
     # Hack to make ontologyid and conceptid work in addition to id and ontology params
     params[:id] = params[:id].nil? ? params[:ontologyid] : params[:id]
     params[:ontology] = params[:ontology].nil? ? params[:id] : params[:ontology]
 
     # Hash to convert Lexvo URI to flag code
     $LEXVO_TO_FLAG = { 'http://lexvo.org/id/iso639-3/aar' => 'aa', 'http://lexvo.org/id/iso639-3/abk' => 'ab',
-                      'http://lexvo.org/id/iso639-3/ave' => 'ae', 'http://lexvo.org/id/iso639-3/afr' => 'af',
-                      'http://lexvo.org/id/iso639-3/aka' => 'ak', 'http://lexvo.org/id/iso639-3/amh' => 'am',
-                      'http://lexvo.org/id/iso639-3/arg' => 'an', 'http://lexvo.org/id/iso639-3/ara' => 'ar', 'http://lexvo.org/id/iso639-3/asm' => 'as', 'http://lexvo.org/id/iso639-3/ava' => 'av', 'http://lexvo.org/id/iso639-3/aym' => 'ay', 'http://lexvo.org/id/iso639-3/aze' => 'az', 'http://lexvo.org/id/iso639-3/bak' => 'ba', 'http://lexvo.org/id/iso639-3/bel' => 'be', 'http://lexvo.org/id/iso639-3/bul' => 'bg', 'http://lexvo.org/id/iso639-3/bis' => 'bi', 'http://lexvo.org/id/iso639-3/bam' => 'bm', 'http://lexvo.org/id/iso639-3/ben' => 'bn', 'http://lexvo.org/id/iso639-3/bod' => 'bo', 'http://lexvo.org/id/iso639-3/bre' => 'br', 'http://lexvo.org/id/iso639-3/bos' => 'bs', 'http://lexvo.org/id/iso639-3/cat' => 'ca', 'http://lexvo.org/id/iso639-3/che' => 'ce', 'http://lexvo.org/id/iso639-3/cha' => 'ch', 'http://lexvo.org/id/iso639-3/cos' => 'co', 'http://lexvo.org/id/iso639-3/cre' => 'cr', 'http://lexvo.org/id/iso639-3/ces' => 'cs', 'http://lexvo.org/id/iso639-3/chu' => 'cu', 'http://lexvo.org/id/iso639-3/chv' => 'cv', 'http://lexvo.org/id/iso639-3/cym' => 'cy', 'http://lexvo.org/id/iso639-3/dan' => 'da', 'http://lexvo.org/id/iso639-3/deu' => 'de', 'http://lexvo.org/id/iso639-3/div' => 'dv', 'http://lexvo.org/id/iso639-3/dzo' => 'dz', 'http://lexvo.org/id/iso639-3/ewe' => 'ee', 'http://lexvo.org/id/iso639-3/ell' => 'el', 'http://lexvo.org/id/iso639-3/eng' => 'en', 'http://lexvo.org/id/iso639-3/epo' => 'eo', 'http://lexvo.org/id/iso639-3/spa' => 'es', 'http://lexvo.org/id/iso639-3/est' => 'et', 'http://lexvo.org/id/iso639-3/eus' => 'eu', 'http://lexvo.org/id/iso639-3/fas' => 'fa', 'http://lexvo.org/id/iso639-3/ful' => 'ff', 'http://lexvo.org/id/iso639-3/fin' => 'fi', 'http://lexvo.org/id/iso639-3/fij' => 'fj', 'http://lexvo.org/id/iso639-3/fao' => 'fo', 'http://lexvo.org/id/iso639-3/fra' => 'fr', 'http://lexvo.org/id/iso639-3/fry' => 'fy', 'http://lexvo.org/id/iso639-3/gle' => 'ga', 'http://lexvo.org/id/iso639-3/gla' => 'gd', 'http://lexvo.org/id/iso639-3/glg' => 'gl', 'http://lexvo.org/id/iso639-3/grn' => 'gn', 'http://lexvo.org/id/iso639-3/guj' => 'gu', 'http://lexvo.org/id/iso639-3/glv' => 'gv', 'http://lexvo.org/id/iso639-3/hau' => 'ha', 'http://lexvo.org/id/iso639-3/heb' => 'he', 'http://lexvo.org/id/iso639-3/hin' => 'hi', 'http://lexvo.org/id/iso639-3/hmo' => 'ho', 'http://lexvo.org/id/iso639-3/hrv' => 'hr', 'http://lexvo.org/id/iso639-3/hat' => 'ht', 'http://lexvo.org/id/iso639-3/hun' => 'hu', 'http://lexvo.org/id/iso639-3/hye' => 'hy', 'http://lexvo.org/id/iso639-3/her' => 'hz', 'http://lexvo.org/id/iso639-3/ina' => 'ia', 'http://lexvo.org/id/iso639-3/ind' => 'id', 'http://lexvo.org/id/iso639-3/ile' => 'ie', 'http://lexvo.org/id/iso639-3/ibo' => 'ig', 'http://lexvo.org/id/iso639-3/iii' => 'ii', 'http://lexvo.org/id/iso639-3/ipk' => 'ik', 'http://lexvo.org/id/iso639-3/ido' => 'io', 'http://lexvo.org/id/iso639-3/isl' => 'is', 'http://lexvo.org/id/iso639-3/ita' => 'it', 'http://lexvo.org/id/iso639-3/iku' => 'iu', 'http://lexvo.org/id/iso639-3/jpn' => 'ja', 'http://lexvo.org/id/iso639-3/jav' => 'jv', 'http://lexvo.org/id/iso639-3/kat' => 'ka', 'http://lexvo.org/id/iso639-3/kon' => 'kg', 'http://lexvo.org/id/iso639-3/kik' => 'ki', 'http://lexvo.org/id/iso639-3/kua' => 'kj', 'http://lexvo.org/id/iso639-3/kaz' => 'kk', 'http://lexvo.org/id/iso639-3/kal' => 'kl', 'http://lexvo.org/id/iso639-3/khm' => 'km', 'http://lexvo.org/id/iso639-3/kan' => 'kn', 'http://lexvo.org/id/iso639-3/kor' => 'ko', 'http://lexvo.org/id/iso639-3/kau' => 'kr', 'http://lexvo.org/id/iso639-3/kas' => 'ks', 'http://lexvo.org/id/iso639-3/kur' => 'ku', 'http://lexvo.org/id/iso639-3/kom' => 'kv', 'http://lexvo.org/id/iso639-3/cor' => 'kw', 'http://lexvo.org/id/iso639-3/kir' => 'ky', 'http://lexvo.org/id/iso639-3/lat' => 'la', 'http://lexvo.org/id/iso639-3/ltz' => 'lb', 'http://lexvo.org/id/iso639-3/lug' => 'lg', 'http://lexvo.org/id/iso639-3/lim' => 'li', 'http://lexvo.org/id/iso639-3/lin' => 'ln', 'http://lexvo.org/id/iso639-3/lao' => 'lo', 'http://lexvo.org/id/iso639-3/lit' => 'lt', 'http://lexvo.org/id/iso639-3/lub' => 'lu', 'http://lexvo.org/id/iso639-3/lav' => 'lv', 'http://lexvo.org/id/iso639-3/mlg' => 'mg', 'http://lexvo.org/id/iso639-3/mah' => 'mh', 'http://lexvo.org/id/iso639-3/mri' => 'mi', 'http://lexvo.org/id/iso639-3/mkd' => 'mk', 'http://lexvo.org/id/iso639-3/mal' => 'ml', 'http://lexvo.org/id/iso639-3/mon' => 'mn', 'http://lexvo.org/id/iso639-3/mar' => 'mr', 'http://lexvo.org/id/iso639-3/msa' => 'ms', 'http://lexvo.org/id/iso639-3/mlt' => 'mt', 'http://lexvo.org/id/iso639-3/mya' => 'my', 'http://lexvo.org/id/iso639-3/nau' => 'na', 'http://lexvo.org/id/iso639-3/nob' => 'nb', 'http://lexvo.org/id/iso639-3/nde' => 'nd', 'http://lexvo.org/id/iso639-3/nep' => 'ne', 'http://lexvo.org/id/iso639-3/ndo' => 'ng', 'http://lexvo.org/id/iso639-3/nld' => 'nl', 'http://lexvo.org/id/iso639-3/nno' => 'nn', 'http://lexvo.org/id/iso639-3/nor' => 'no', 'http://lexvo.org/id/iso639-3/nbl' => 'nr', 'http://lexvo.org/id/iso639-3/nav' => 'nv', 'http://lexvo.org/id/iso639-3/nya' => 'ny', 'http://lexvo.org/id/iso639-3/oci' => 'oc', 'http://lexvo.org/id/iso639-3/oji' => 'oj', 'http://lexvo.org/id/iso639-3/orm' => 'om', 'http://lexvo.org/id/iso639-3/ori' => 'or', 'http://lexvo.org/id/iso639-3/oss' => 'os', 'http://lexvo.org/id/iso639-3/pan' => 'pa', 'http://lexvo.org/id/iso639-3/pli' => 'pi', 'http://lexvo.org/id/iso639-3/pol' => 'pl', 'http://lexvo.org/id/iso639-3/pus' => 'ps', 'http://lexvo.org/id/iso639-3/por' => 'pt', 'http://lexvo.org/id/iso639-3/que' => 'qu', 'http://lexvo.org/id/iso639-3/roh' => 'rm', 'http://lexvo.org/id/iso639-3/run' => 'rn', 'http://lexvo.org/id/iso639-3/ron' => 'ro', 'http://lexvo.org/id/iso639-3/rus' => 'ru', 'http://lexvo.org/id/iso639-3/kin' => 'rw', 'http://lexvo.org/id/iso639-3/san' => 'sa', 'http://lexvo.org/id/iso639-3/srd' => 'sc', 'http://lexvo.org/id/iso639-3/snd' => 'sd', 'http://lexvo.org/id/iso639-3/sme' => 'se', 'http://lexvo.org/id/iso639-3/sag' => 'sg', 'http://lexvo.org/id/iso639-3/hbs' => 'sh', 'http://lexvo.org/id/iso639-3/sin' => 'si', 'http://lexvo.org/id/iso639-3/slk' => 'sk', 'http://lexvo.org/id/iso639-3/slv' => 'sl', 'http://lexvo.org/id/iso639-3/smo' => 'sm', 'http://lexvo.org/id/iso639-3/sna' => 'sn', 'http://lexvo.org/id/iso639-3/som' => 'so', 'http://lexvo.org/id/iso639-3/sqi' => 'sq', 'http://lexvo.org/id/iso639-3/srp' => 'sr', 'http://lexvo.org/id/iso639-3/ssw' => 'ss', 'http://lexvo.org/id/iso639-3/sot' => 'st', 'http://lexvo.org/id/iso639-3/sun' => 'su', 'http://lexvo.org/id/iso639-3/swe' => 'sv', 'http://lexvo.org/id/iso639-3/swa' => 'sw', 'http://lexvo.org/id/iso639-3/tam' => 'ta', 'http://lexvo.org/id/iso639-3/tel' => 'te', 'http://lexvo.org/id/iso639-3/tgk' => 'tg', 'http://lexvo.org/id/iso639-3/tha' => 'th', 'http://lexvo.org/id/iso639-3/tir' => 'ti', 'http://lexvo.org/id/iso639-3/tuk' => 'tk', 'http://lexvo.org/id/iso639-3/tgl' => 'tl', 'http://lexvo.org/id/iso639-3/tsn' => 'tn', 'http://lexvo.org/id/iso639-3/ton' => 'to', 'http://lexvo.org/id/iso639-3/tur' => 'tr', 'http://lexvo.org/id/iso639-3/tso' => 'ts', 'http://lexvo.org/id/iso639-3/tat' => 'tt', 'http://lexvo.org/id/iso639-3/twi' => 'tw', 'http://lexvo.org/id/iso639-3/tah' => 'ty', 'http://lexvo.org/id/iso639-3/uig' => 'ug', 'http://lexvo.org/id/iso639-3/ukr' => 'uk', 'http://lexvo.org/id/iso639-3/urd' => 'ur', 'http://lexvo.org/id/iso639-3/uzb' => 'uz', 'http://lexvo.org/id/iso639-3/ven' => 've', 'http://lexvo.org/id/iso639-3/vie' => 'vi', 'http://lexvo.org/id/iso639-3/vol' => 'vo', 'http://lexvo.org/id/iso639-3/wln' => 'wa', 'http://lexvo.org/id/iso639-3/wol' => 'wo', 'http://lexvo.org/id/iso639-3/xho' => 'xh', 'http://lexvo.org/id/iso639-3/yid' => 'yi', 'http://lexvo.org/id/iso639-3/yor' => 'yo', 'http://lexvo.org/id/iso639-3/zha' => 'za', 'http://lexvo.org/id/iso639-3/zho' => 'zh', 'http://lexvo.org/id/iso639-3/zul' => 'zu' }
+                       'http://lexvo.org/id/iso639-3/ave' => 'ae', 'http://lexvo.org/id/iso639-3/afr' => 'af',
+                       'http://lexvo.org/id/iso639-3/aka' => 'ak', 'http://lexvo.org/id/iso639-3/amh' => 'am',
+                       'http://lexvo.org/id/iso639-3/arg' => 'an', 'http://lexvo.org/id/iso639-3/ara' => 'ar', 'http://lexvo.org/id/iso639-3/asm' => 'as', 'http://lexvo.org/id/iso639-3/ava' => 'av', 'http://lexvo.org/id/iso639-3/aym' => 'ay', 'http://lexvo.org/id/iso639-3/aze' => 'az', 'http://lexvo.org/id/iso639-3/bak' => 'ba', 'http://lexvo.org/id/iso639-3/bel' => 'be', 'http://lexvo.org/id/iso639-3/bul' => 'bg', 'http://lexvo.org/id/iso639-3/bis' => 'bi', 'http://lexvo.org/id/iso639-3/bam' => 'bm', 'http://lexvo.org/id/iso639-3/ben' => 'bn', 'http://lexvo.org/id/iso639-3/bod' => 'bo', 'http://lexvo.org/id/iso639-3/bre' => 'br', 'http://lexvo.org/id/iso639-3/bos' => 'bs', 'http://lexvo.org/id/iso639-3/cat' => 'ca', 'http://lexvo.org/id/iso639-3/che' => 'ce', 'http://lexvo.org/id/iso639-3/cha' => 'ch', 'http://lexvo.org/id/iso639-3/cos' => 'co', 'http://lexvo.org/id/iso639-3/cre' => 'cr', 'http://lexvo.org/id/iso639-3/ces' => 'cs', 'http://lexvo.org/id/iso639-3/chu' => 'cu', 'http://lexvo.org/id/iso639-3/chv' => 'cv', 'http://lexvo.org/id/iso639-3/cym' => 'cy', 'http://lexvo.org/id/iso639-3/dan' => 'da', 'http://lexvo.org/id/iso639-3/deu' => 'de', 'http://lexvo.org/id/iso639-3/div' => 'dv', 'http://lexvo.org/id/iso639-3/dzo' => 'dz', 'http://lexvo.org/id/iso639-3/ewe' => 'ee', 'http://lexvo.org/id/iso639-3/ell' => 'el', 'http://lexvo.org/id/iso639-3/eng' => 'en', 'http://lexvo.org/id/iso639-3/epo' => 'eo', 'http://lexvo.org/id/iso639-3/spa' => 'es', 'http://lexvo.org/id/iso639-3/est' => 'et', 'http://lexvo.org/id/iso639-3/eus' => 'eu', 'http://lexvo.org/id/iso639-3/fas' => 'fa', 'http://lexvo.org/id/iso639-3/ful' => 'ff', 'http://lexvo.org/id/iso639-3/fin' => 'fi', 'http://lexvo.org/id/iso639-3/fij' => 'fj', 'http://lexvo.org/id/iso639-3/fao' => 'fo', 'http://lexvo.org/id/iso639-3/fra' => 'fr', 'http://lexvo.org/id/iso639-3/fry' => 'fy', 'http://lexvo.org/id/iso639-3/gle' => 'ga', 'http://lexvo.org/id/iso639-3/gla' => 'gd', 'http://lexvo.org/id/iso639-3/glg' => 'gl', 'http://lexvo.org/id/iso639-3/grn' => 'gn', 'http://lexvo.org/id/iso639-3/guj' => 'gu', 'http://lexvo.org/id/iso639-3/glv' => 'gv', 'http://lexvo.org/id/iso639-3/hau' => 'ha', 'http://lexvo.org/id/iso639-3/heb' => 'he', 'http://lexvo.org/id/iso639-3/hin' => 'hi', 'http://lexvo.org/id/iso639-3/hmo' => 'ho', 'http://lexvo.org/id/iso639-3/hrv' => 'hr', 'http://lexvo.org/id/iso639-3/hat' => 'ht', 'http://lexvo.org/id/iso639-3/hun' => 'hu', 'http://lexvo.org/id/iso639-3/hye' => 'hy', 'http://lexvo.org/id/iso639-3/her' => 'hz', 'http://lexvo.org/id/iso639-3/ina' => 'ia', 'http://lexvo.org/id/iso639-3/ind' => 'id', 'http://lexvo.org/id/iso639-3/ile' => 'ie', 'http://lexvo.org/id/iso639-3/ibo' => 'ig', 'http://lexvo.org/id/iso639-3/iii' => 'ii', 'http://lexvo.org/id/iso639-3/ipk' => 'ik', 'http://lexvo.org/id/iso639-3/ido' => 'io', 'http://lexvo.org/id/iso639-3/isl' => 'is', 'http://lexvo.org/id/iso639-3/ita' => 'it', 'http://lexvo.org/id/iso639-3/iku' => 'iu', 'http://lexvo.org/id/iso639-3/jpn' => 'ja', 'http://lexvo.org/id/iso639-3/jav' => 'jv', 'http://lexvo.org/id/iso639-3/kat' => 'ka', 'http://lexvo.org/id/iso639-3/kon' => 'kg', 'http://lexvo.org/id/iso639-3/kik' => 'ki', 'http://lexvo.org/id/iso639-3/kua' => 'kj', 'http://lexvo.org/id/iso639-3/kaz' => 'kk', 'http://lexvo.org/id/iso639-3/kal' => 'kl', 'http://lexvo.org/id/iso639-3/khm' => 'km', 'http://lexvo.org/id/iso639-3/kan' => 'kn', 'http://lexvo.org/id/iso639-3/kor' => 'ko', 'http://lexvo.org/id/iso639-3/kau' => 'kr', 'http://lexvo.org/id/iso639-3/kas' => 'ks', 'http://lexvo.org/id/iso639-3/kur' => 'ku', 'http://lexvo.org/id/iso639-3/kom' => 'kv', 'http://lexvo.org/id/iso639-3/cor' => 'kw', 'http://lexvo.org/id/iso639-3/kir' => 'ky', 'http://lexvo.org/id/iso639-3/lat' => 'la', 'http://lexvo.org/id/iso639-3/ltz' => 'lb', 'http://lexvo.org/id/iso639-3/lug' => 'lg', 'http://lexvo.org/id/iso639-3/lim' => 'li', 'http://lexvo.org/id/iso639-3/lin' => 'ln', 'http://lexvo.org/id/iso639-3/lao' => 'lo', 'http://lexvo.org/id/iso639-3/lit' => 'lt', 'http://lexvo.org/id/iso639-3/lub' => 'lu', 'http://lexvo.org/id/iso639-3/lav' => 'lv', 'http://lexvo.org/id/iso639-3/mlg' => 'mg', 'http://lexvo.org/id/iso639-3/mah' => 'mh', 'http://lexvo.org/id/iso639-3/mri' => 'mi', 'http://lexvo.org/id/iso639-3/mkd' => 'mk', 'http://lexvo.org/id/iso639-3/mal' => 'ml', 'http://lexvo.org/id/iso639-3/mon' => 'mn', 'http://lexvo.org/id/iso639-3/mar' => 'mr', 'http://lexvo.org/id/iso639-3/msa' => 'ms', 'http://lexvo.org/id/iso639-3/mlt' => 'mt', 'http://lexvo.org/id/iso639-3/mya' => 'my', 'http://lexvo.org/id/iso639-3/nau' => 'na', 'http://lexvo.org/id/iso639-3/nob' => 'nb', 'http://lexvo.org/id/iso639-3/nde' => 'nd', 'http://lexvo.org/id/iso639-3/nep' => 'ne', 'http://lexvo.org/id/iso639-3/ndo' => 'ng', 'http://lexvo.org/id/iso639-3/nld' => 'nl', 'http://lexvo.org/id/iso639-3/nno' => 'nn', 'http://lexvo.org/id/iso639-3/nor' => 'no', 'http://lexvo.org/id/iso639-3/nbl' => 'nr', 'http://lexvo.org/id/iso639-3/nav' => 'nv', 'http://lexvo.org/id/iso639-3/nya' => 'ny', 'http://lexvo.org/id/iso639-3/oci' => 'oc', 'http://lexvo.org/id/iso639-3/oji' => 'oj', 'http://lexvo.org/id/iso639-3/orm' => 'om', 'http://lexvo.org/id/iso639-3/ori' => 'or', 'http://lexvo.org/id/iso639-3/oss' => 'os', 'http://lexvo.org/id/iso639-3/pan' => 'pa', 'http://lexvo.org/id/iso639-3/pli' => 'pi', 'http://lexvo.org/id/iso639-3/pol' => 'pl', 'http://lexvo.org/id/iso639-3/pus' => 'ps', 'http://lexvo.org/id/iso639-3/por' => 'pt', 'http://lexvo.org/id/iso639-3/que' => 'qu', 'http://lexvo.org/id/iso639-3/roh' => 'rm', 'http://lexvo.org/id/iso639-3/run' => 'rn', 'http://lexvo.org/id/iso639-3/ron' => 'ro', 'http://lexvo.org/id/iso639-3/rus' => 'ru', 'http://lexvo.org/id/iso639-3/kin' => 'rw', 'http://lexvo.org/id/iso639-3/san' => 'sa', 'http://lexvo.org/id/iso639-3/srd' => 'sc', 'http://lexvo.org/id/iso639-3/snd' => 'sd', 'http://lexvo.org/id/iso639-3/sme' => 'se', 'http://lexvo.org/id/iso639-3/sag' => 'sg', 'http://lexvo.org/id/iso639-3/hbs' => 'sh', 'http://lexvo.org/id/iso639-3/sin' => 'si', 'http://lexvo.org/id/iso639-3/slk' => 'sk', 'http://lexvo.org/id/iso639-3/slv' => 'sl', 'http://lexvo.org/id/iso639-3/smo' => 'sm', 'http://lexvo.org/id/iso639-3/sna' => 'sn', 'http://lexvo.org/id/iso639-3/som' => 'so', 'http://lexvo.org/id/iso639-3/sqi' => 'sq', 'http://lexvo.org/id/iso639-3/srp' => 'sr', 'http://lexvo.org/id/iso639-3/ssw' => 'ss', 'http://lexvo.org/id/iso639-3/sot' => 'st', 'http://lexvo.org/id/iso639-3/sun' => 'su', 'http://lexvo.org/id/iso639-3/swe' => 'sv', 'http://lexvo.org/id/iso639-3/swa' => 'sw', 'http://lexvo.org/id/iso639-3/tam' => 'ta', 'http://lexvo.org/id/iso639-3/tel' => 'te', 'http://lexvo.org/id/iso639-3/tgk' => 'tg', 'http://lexvo.org/id/iso639-3/tha' => 'th', 'http://lexvo.org/id/iso639-3/tir' => 'ti', 'http://lexvo.org/id/iso639-3/tuk' => 'tk', 'http://lexvo.org/id/iso639-3/tgl' => 'tl', 'http://lexvo.org/id/iso639-3/tsn' => 'tn', 'http://lexvo.org/id/iso639-3/ton' => 'to', 'http://lexvo.org/id/iso639-3/tur' => 'tr', 'http://lexvo.org/id/iso639-3/tso' => 'ts', 'http://lexvo.org/id/iso639-3/tat' => 'tt', 'http://lexvo.org/id/iso639-3/twi' => 'tw', 'http://lexvo.org/id/iso639-3/tah' => 'ty', 'http://lexvo.org/id/iso639-3/uig' => 'ug', 'http://lexvo.org/id/iso639-3/ukr' => 'uk', 'http://lexvo.org/id/iso639-3/urd' => 'ur', 'http://lexvo.org/id/iso639-3/uzb' => 'uz', 'http://lexvo.org/id/iso639-3/ven' => 've', 'http://lexvo.org/id/iso639-3/vie' => 'vi', 'http://lexvo.org/id/iso639-3/vol' => 'vo', 'http://lexvo.org/id/iso639-3/wln' => 'wa', 'http://lexvo.org/id/iso639-3/wol' => 'wo', 'http://lexvo.org/id/iso639-3/xho' => 'xh', 'http://lexvo.org/id/iso639-3/yid' => 'yi', 'http://lexvo.org/id/iso639-3/yor' => 'yo', 'http://lexvo.org/id/iso639-3/zha' => 'za', 'http://lexvo.org/id/iso639-3/zho' => 'zh', 'http://lexvo.org/id/iso639-3/zul' => 'zu' }
 
     # PURL-specific redirect to handle /ontologies/{ACR}/{CLASS_ID} paths
     if params[:purl_conceptid]
@@ -335,48 +336,44 @@ def show
       end
     end
 
-    @ob_instructions = helpers.ontolobridge_instructions_template(@ontology)
-
-    # Retrieve submissions in descending submissionId order (should be reverse chronological order)
-    @submissions = @ontology.explore.submissions.sort {|a,b| b.submissionId.to_i <=> a.submissionId.to_i } || []
-    LOG.add :error, "No submissions for ontology: #{@ontology.id}" if @submissions.empty?
+    #@ob_instructions = helpers.ontolobridge_instructions_template(@ontology)
 
     # Get the latest submission (not necessarily the latest 'ready' submission)
     @submission_latest = @ontology.explore.latest_submission rescue @ontology.explore.latest_submission(include: '')
 
     # Is the ontology downloadable?
-    restrict_downloads = $NOT_DOWNLOADABLE
-    @ont_restricted = restrict_downloads.include? @ontology.acronym
+    @ont_restricted = ontology_restricted?(@ontology.acronym)
 
     # Fix parameters to only use known pages
     params[:p] = nil unless KNOWN_PAGES.include?(params[:p])
 
     # This action is now a router using the 'p' parameter as the page to show
     case params[:p]
-      when 'terms'
-        params[:p] = 'classes'
-        redirect_to "/ontologies/#{params[:ontology]}#{params_string_for_redirect(params)}", status: :moved_permanently
-      when 'classes'
-        self.classes #rescue self.summary
-      when 'mappings'
-        self.mappings #rescue self.summary
-      when 'notes'
-        self.notes #rescue self.summary
-      when 'widgets'
-        self.widgets #rescue self.summary
-      when 'properties'
-        self.properties #rescue self.summary
-      when 'summary'
-        self.summary
-      when 'instances'
-        self.instances
-      when 'schemes'
-        self.schemes
-      when 'collections'
-        self.collections
-      else
-        self.summary
+    when 'terms'
+      params[:p] = 'classes'
+      redirect_to "/ontologies/#{params[:ontology]}#{params_string_for_redirect(params)}", status: :moved_permanently
+    when 'classes'
+      self.classes #rescue self.summary
+    when 'mappings'
+      self.mappings #rescue self.summary
+    when 'notes'
+      self.notes #rescue self.summary
+    when 'widgets'
+      self.widgets #rescue self.summary
+    when 'properties'
+      self.properties #rescue self.summary
+    when 'summary'
+      self.summary
+    when 'instances'
+      self.instances
+    when 'schemes'
+      self.schemes
+    when 'collections'
+      self.collections
+    else
+      self.summary
     end
+
   end
 
   def submit_success
@@ -387,7 +384,7 @@ def submit_success
   # Main ontology description page (with metadata): /ontologies/ACRONYM
   def summary
     # Note: find_by_acronym includes ontology views
-    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:id]).first
+    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:id]).first if @ontology.nil?
     ontology_not_found(params[:id]) if @ontology.nil?
     # Check to see if user is requesting json-ld, return the file from REST service if so
 
@@ -398,7 +395,7 @@ def summary
     end
 
     @metrics = @ontology.explore.metrics rescue []
-    @reviews = @ontology.explore.reviews.sort {|a,b| b.created <=> a.created} || []
+    #@reviews = @ontology.explore.reviews.sort {|a,b| b.created <=> a.created} || []
     @projects = @ontology.explore.projects.sort {|a,b| a.name.downcase <=> b.name.downcase } || []
     @analytics = LinkedData::Client::HTTP.get(@ontology.links['analytics'])
 
@@ -406,16 +403,9 @@ def summary
     tmp = fairness_service_enabled? ? get_fair_score(@ontology.acronym) : nil
     @fair_scores_data = create_fair_scores_data(tmp.values.first) unless tmp.nil?
 
-
-    # retrieve submissions in descending submissionId order, should be reverse chronological order.
-    # Only include metadata that we need for all other ontologies (faster)
-    @submissions = @ontology.explore.submissions({include: "submissionId,creationDate,released,modificationDate,submissionStatus,hasOntologyLanguage,version,diffFilePath,ontology"})
-                            .sort {|a,b| b.submissionId.to_i <=> a.submissionId.to_i } || []
-    LOG.add :error, "No submissions for ontology: #{@ontology.id}" if @submissions.empty?
-    # Get the latest submission, not necessarily the latest 'ready' submission
-    @submission_latest = @ontology.explore.latest_submission rescue @ontology.explore.latest_submission(include: '')
     @views = get_views(@ontology)
     @view_decorators = @views.map{ |view| ViewDecorator.new(view, view_context) }
+
     if request.xhr?
       render partial: 'ontologies/sections/metadata', layout: false
     else
diff --git a/app/controllers/ontologies_metadata_curator_controller.rb b/app/controllers/ontologies_metadata_curator_controller.rb
new file mode 100644
index 0000000000..7b9c95cfb7
--- /dev/null
+++ b/app/controllers/ontologies_metadata_curator_controller.rb
@@ -0,0 +1,165 @@
+class OntologiesMetadataCuratorController < ApplicationController
+  include TurboHelper, SubmissionsHelper, ActionView::Helpers::FormHelper
+  include SubmissionUpdater
+  layout :determine_layout
+  before_action :submission_metadata, only: [:result, :edit, :update, :show_metadata_by_ontology]
+
+  def result
+    @ontologies_ids = params[:ontology][:ontologyId].drop(1)
+    @metadata_sel = params[:search][:metadata].drop(1)
+    @show_submissions = !params[:show_submissions].nil?
+    @ontologies = []
+    @submissions = []
+    if @ontologies_ids.nil? || @ontologies_ids.empty?
+      @ontologies = LinkedData::Client::Models::Ontology.all
+    else
+      @ontologies_ids.each do |data|
+        @ontologies << LinkedData::Client::Models::Ontology.find_by_acronym(data).first
+      end
+    end
+
+    display_attribute = equivalent_properties(@metadata_sel) + %w[submissionId]
+    @ontologies.each do |ont|
+      if @show_submissions
+        submissions = ont.explore.submissions({ include: display_attribute.join(',') })
+      else
+        submissions = [ont.explore.latest_submission({ include: display_attribute.join(',') })]
+      end
+      submissions.each { |sub| append_submission(ont, sub) }
+    end
+
+    respond_to do |format|
+      format.html { redirect_to admin_index_path }
+      format.turbo_stream { render turbo_stream: [
+        replace("selection_metadata_form", partial: "ontologies_metadata_curator/metadata_table"),
+        replace('edit_metadata_btn') do
+          "
+           #{helpers.button_tag("Start bulk edit", onclick: 'showEditForm(event)', class: "btn btn-outline-primary mx-1 w-100")}
+           #{raw helpers.help_tooltip('To use the bulk edit select in the table submissions (the rows) and metadata properties (the columns) for which you want to edit')}
+          ".html_safe
+        end
+      ]}
+    end
+  end
+
+  def show_metadata_by_ontology
+    @acronym = params[:ontology]
+    inline_save = params[:inline_save] && params[:inline_save].eql?('true')
+    display_submission_attributes(@acronym, params[:properties]&.split(','),
+                                  submissionId: params[:submission_id],
+                                  show_sections: false, inline_save: inline_save)
+    render partial: 'submissions/form_content', locals: { id: params[:form_id] || '', acronym: @acronym, submissionId: params[:submission_id] }
+  end
+
+  def show_metadata_value
+    acronym = params[:ontology]
+    attribute = params[:attribute]
+    submission_id = params[:submission_id]
+    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(acronym).first
+    @submission = @ontology.explore.submissions({ display: "#{attribute},submissionId" }, submission_id)
+
+    render_submission_attribute(attribute)
+  end
+
+  def edit
+
+    if params[:selected_acronyms].nil? || params[:selected_metadata].nil?
+      render_turbo_stream alert_error(id: 'application_modal_content') {'Select in the table submissions (rows) and metadata properties (columns) to start the bulk edit'}
+      return
+    end
+
+    @selected_ontologies = params[:selected_acronyms].map { |x| ontology_and_submission_id(x) }
+    @selected_metadata = params[:selected_metadata]
+    @all_metadata = params[:all_metadata]
+    render partial: 'ontologies_metadata_curator/form_edit'
+  end
+
+  def update
+    @selected_ontologies = params[:selected_ontologies].map { |x| ontology_and_submission_id(x) }
+    @active_ontology = ontology_and_submission_id(params[:active_ontology])
+    @all_metadata = params[:all_metadata]&.split
+    error_responses = []
+    @submissions =  []
+    active_submission_data = params['submission']["#{@active_ontology[0]}_#{@active_ontology[1]}"]
+
+    @selected_ontologies.each do |onto, sub_i|
+      new_data = active_submission_data
+      new_data[:ontology] = onto
+      new_data[:id] = sub_i
+      error_responses << update_submission(new_data) if new_data
+      @submissions << @submission
+    end
+
+    errors = nil
+    if error_responses.compact.any? { |x| x.status != 204 }
+      errors = error_responses.map { |error_response| response_errors(error_response) }
+    end
+    respond_to do |format|
+      format.turbo_stream do
+        if errors
+          render_turbo_stream(alert_error { errors.map { |e| e[:error] }.join(',') })
+        else
+          streams = [alert_success { 'Submissions were successfully updated' }]
+          @submissions.each do |submission|
+            submission.ontology = OpenStruct.new({acronym: submission.ontology})
+            streams << replace("#{ontology_submission_id_label(submission.ontology.acronym, submission.submissionId)}_row", partial: 'ontologies_metadata_curator/metadata_table_row', locals: {submission: submission, attributes: @all_metadata })
+          end
+          render_turbo_stream(*streams)
+        end
+      end
+    end
+  end
+
+  private
+
+
+  def append_submission(ontology, submission)
+    sub = submission
+    return if sub.nil?
+
+    sub.ontology = ontology
+    @submissions << sub
+  end
+
+  def metadata_params
+    attributes = [
+      :ontology,
+      :description,
+      :hasOntologyLanguage,
+      :prefLabelProperty,
+      :synonymProperty,
+      :definitionProperty,
+      :authorProperty,
+      :obsoleteProperty,
+      :obsoleteParent,
+      :version,
+      :status,
+      :released,
+      :isRemote,
+      :pullLocation,
+      :filePath,
+      { contact: [:name, :email] },
+      :homepage,
+      :documentation,
+      :publication
+    ]
+
+    @metadata.each do |m|
+
+      m_attr = m["attribute"].to_sym
+
+      attributes << if m["enforce"].include?("list")
+                      { m_attr => [] }
+                    else
+                      m_attr
+                    end
+    end
+    out = []
+    params.require(:submission).permit!.tap do |x|
+      x.keys.each do |y|
+        out << x.require(y).permit(attributes.uniq)
+      end
+    end
+    out
+  end
+end
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 0f8c44dd7d..639eee192a 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -1,48 +1,42 @@
 class SubmissionsController < ApplicationController
-
+  include SubmissionsHelper, SubmissionUpdater
   layout :determine_layout
   before_action :authorize_and_redirect, :only => [:edit, :update, :create, :new]
-  before_action :submission_metadata, only: [:create, :edit, :new, :update]
+  before_action :submission_metadata, only: [:create, :edit, :new, :update, :index]
+
+
+  def index
+    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id]).first
+
+    ontology_not_found(params[:ontology_id]) if @ontology.nil?
+
+    @ont_restricted = ontology_restricted?(@ontology.acronym)
+
+    # Retrieve submissions in descending submissionId order (should be reverse chronological order)
+    @submissions = @ontology.explore.submissions({include: "submissionId,creationDate,released,modificationDate,submissionStatus,hasOntologyLanguage,version,diffFilePath,ontology"})
+                            .sort {|a,b| b.submissionId.to_i <=> a.submissionId.to_i } || []
+
+    LOG.add :error, "No submissions for ontology: #{@ontology.id}" if @submissions.empty?
+
+  end
 
   # When getting "Add submission" form to display
   def new
+    @required_only = params[:required].nil? || !params[:required]&.eql?('false')
     @ontology = LinkedData::Client::Models::Ontology.get(CGI.unescape(params[:ontology_id])) rescue nil
     @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id]).first unless @ontology
     @submission = @ontology.explore.latest_submission
     @submission ||= LinkedData::Client::Models::OntologySubmission.new
+    @submission.id = nil
   end
 
   # Called when form to "Add submission" is submitted
   def create
     # Make the contacts an array
-    params[:submission][:contact] = params[:submission][:contact].values
-
-    # Convert metadata that needs to be integer to int
-    @metadata.map do |hash|
-      if hash["enforce"].include?("integer")
-        if !params[:submission][hash["attribute"]].nil? && !params[:submission][hash["attribute"]].eql?("")
-          params[:submission][hash["attribute"].to_s.to_sym] = Integer(params[:submission][hash["attribute"].to_s.to_sym])
-        end
-      end
-      if hash["enforce"].include?("boolean") && !params[:submission][hash["attribute"]].nil?
-        if params[:submission][hash["attribute"]].eql?("true")
-          params[:submission][hash["attribute"].to_s.to_sym] = true
-        elsif params[:submission][hash["attribute"]].eql?("false")
-          params[:submission][hash["attribute"].to_s.to_sym] = false
-        else
-          params[:submission][hash["attribute"].to_s.to_sym] = nil
-        end
-      end
-    end
-
-    @submission = LinkedData::Client::Models::OntologySubmission.new(values: submission_params)
-    @ontology = LinkedData::Client::Models::Ontology.get(params[:submission][:ontology])
-    
-    # Update summaryOnly on ontology object
-    @ontology.summaryOnly = @submission.isRemote.eql?("3")
-    @ontology.update
-    
-    @submission_saved = @submission.save(cache_refresh_all: false)
+    _, submission_params = params[:submission].each.first
+    @required_only = !params['required-only'].nil?
+    @filters_disabled = true
+    @submission_saved = save_submission(submission_params)
     if response_error?(@submission_saved)
       @errors = response_errors(@submission_saved) # see application_controller::response_errors
       if @errors && @errors[:uploadFilePath]
@@ -59,101 +53,31 @@ def create
 
   # Called when form to "Edit submission" is submitted
   def edit
-    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(params[:ontology_id]).first
-
-    #submissions = @ontology.explore.submissions
-    # Trying to get all submissions to get the latest. Useless and too long.
-    #@submission = submissions.select {|o| o.submissionId == params["id"].to_i}.first
-    @submission = @ontology.explore.latest_submission
+    display_submission_attributes params[:ontology_id], params[:properties]&.split(','), submissionId: params[:id],
+                                  required: params[:required]&.eql?('true'),
+                                  show_sections: params[:show_sections].nil? || params[:show_sections].eql?('true'),
+                                  inline_save: params[:inline_save]&.eql?('true')
   end
 
   # When editing a submission (called when submit "Edit submission information" form)
   def update
-    # Make the contacts an array
-    params[:submission][:contact] = params[:submission][:contact].values if !params[:submission][:contact].nil?
-
-    params[:submission][:contact].delete_if { |c| c[:name].empty? || c[:email].empty? }
-
-    @ontology = LinkedData::Client::Models::Ontology.get(params[:submission][:ontology])
-
-    #submissions = @ontology.explore.submissions
-    #@submission = submissions.select {|o| o.submissionId == params["id"].to_i}.first
-    @submission = @ontology.explore.latest_submission
+    error_responses = []
+    _, submission_params = params[:submission].each.first
+    @required_only = !params['required-only'].nil?
+    @filters_disabled = true
+    
+    error_responses << update_submission(submission_params)
 
-    # Convert metadata that needs to be integer to int
-    @metadata.map do |hash|
-      if hash["enforce"].include?("integer")
-        if !params[:submission][hash["attribute"]].nil? && !params[:submission][hash["attribute"]].eql?("")
-          params[:submission][hash["attribute"].to_s.to_sym] = Integer(params[:submission][hash["attribute"].to_s.to_sym])
-        end
-      end
-      if hash["enforce"].include?("boolean") && !params[:submission][hash["attribute"]].nil?
-        if params[:submission][hash["attribute"]].eql?("true")
-          params[:submission][hash["attribute"].to_s.to_sym] = true
-        elsif params[:submission][hash["attribute"]].eql?("false")
-          params[:submission][hash["attribute"].to_s.to_sym] = false
-        else
-          params[:submission][hash["attribute"].to_s.to_sym] = nil
-        end
-      end
+    if error_responses.compact.any? { |x| x.status != 204 }
+      @errors = error_responses.map { |error_response| response_errors(error_response) }
     end
 
-    @submission.update_from_params(submission_params)
-    # Update summaryOnly on ontology object
-    @ontology.summaryOnly = @submission.isRemote.eql?('3')
-    @ontology.update
-    error_response = @submission.update(cache_refresh_all: false)
-    if response_error?(error_response)
-      @errors = response_errors(error_response) # see application_controller::response_errors
+    if params[:attribute]
+      render_submission_attribute(params[:attribute])
     else
       redirect_to "/ontologies/#{@ontology.acronym}"
     end
-  end
-
-  private
-
-  def submission_params
-    attributes = [
-      :ontology,
-      :description,
-      :hasOntologyLanguage,
-      :prefLabelProperty,
-      :synonymProperty,
-      :definitionProperty,
-      :authorProperty,
-      :obsoleteProperty,
-      :obsoleteParent,
-      :version,
-      :status,
-      :released,
-      :isRemote,
-      :pullLocation,
-      :filePath,
-      { contact: [:name, :email] },
-      :homepage,
-      :documentation,
-      :publication
-    ]
-
-    @metadata.each do |m|
-
-      m_attr = m["attribute"].to_sym
-
-      attributes << if m["enforce"].include?("list")
-                      { m_attr => [] }
-                    else
-                      m_attr
-                    end
-    end
 
-    p = params.require(:submission).permit(attributes.uniq)
-    p.to_h.transform_values do |v|
-      if v.is_a? Array
-        v.reject(&:empty?)
-      else
-        v
-      end
-    end
   end
 
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c358ede42a..ec96027e67 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,8 +1,8 @@
 class UsersController < ApplicationController
+  
   before_action :unescape_id, only: [:edit, :show, :update]
-  before_action :verify_owner, only: [:edit, :show]
-  before_action :authorize_admin, only: [:index]
-
+  before_action :verify_owner, only: [:edit, :show, :subscribe, :un_subscribe]
+  before_action :authorize_admin, only: [:index,:subscribe, :un_subscribe]
   layout :determine_layout
 
   # GET /users
@@ -69,7 +69,7 @@ def create
       else
         # Attempt to register user to list
         if params[:user][:register_mail_list]
-          Notifier.register_for_announce_list(@user.email).deliver rescue nil
+          SubscribeMailer.register_for_announce_list(@user.email,@user.firstName,@user.lastName).deliver rescue nil
         end
 
         flash[:notice] = 'Account was successfully created'
@@ -158,13 +158,46 @@ def custom_ontologies
     redirect_to user_path(@user.username)
   end
 
+  
+  def subscribe
+    @user = LinkedData::Client::Models::User.find_by_username(params[:username]).first
+    deliver "subscribe", SubscribeMailer.register_for_announce_list(@user.email,@user.firstName,@user.lastName)
+  end
+
+  def un_subscribe
+    @email = params[:email] 
+    deliver "unsubscribe", SubscribeMailer.unregister_for_announce_list(@email)
+  end
+
+  
   private
 
+  def deliver(action,job)
+    begin
+      job.deliver
+      to_or_from = action.eql?("subscribe") ? "to" : "from"
+      flash[:success] = "You have successfully  #{action} #{to_or_from} our user mailing list: #{$ANNOUNCE_LIST}"
+    rescue => exception
+      flash[:error] = "Something went wrong ..."
+    end
+    redirect_to '/account'
+  end
+
   def user_params
-    p = params.require(:user).permit(:firstName, :lastName, :username, :email, :email_confirmation, :password,
+    params[:user]["orcidId"] = extract_id_from_url(params[:user]["orcidId"], 'orcid.org')
+    params[:user]["githubId"] = extract_id_from_url(params[:user]["githubId"], 'github.com')
+    p = params.require(:user).permit(:firstName, :lastName, :username, :orcidId, :githubId, :email, :email_confirmation, :password,
                                      :password_confirmation, :register_mail_list, :admin)
     p.to_h
   end
+  
+  def extract_id_from_url(url, pattern)
+    if url.include? (pattern)
+      url.split('/').last 
+    else
+      url
+    end
+  end
 
   def unescape_id
     params[:id] = CGI.unescape(params[:id])
@@ -191,9 +224,6 @@ def validate(params)
     if params[:email].nil? || params[:email].length < 1 || !params[:email].match(/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i)
       errors << "Please enter an email address"
     end
-    if !params[:email].eql?(params[:email_confirmation])
-      errors << "Your Email and Email Confirmation do not match"
-    end
     if params[:password].nil? || params[:password].length < 1
       errors << "Please enter a password"
     end
@@ -235,4 +265,5 @@ def update_role(user)
 
     user_roles
   end
+
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 62b98643bd..c177add57c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -35,6 +35,10 @@ def escape(string)
     CGI.escape(string)
   end
 
+  def unescape(string)
+    CGI.unescape(string)
+  end
+
   def clean(string)
     string = string.gsub("\"",'\'')
     return string.gsub("\n",'')
@@ -156,7 +160,6 @@ def build_tree(node, string, id, concept_schemes: [])
 
       # This fake root will be present at the root of "flat" ontologies, we need to keep the id intact
 
-
       if child.id.eql?('bp_fake_root')
         string << tree_link_to_concept(child: child, ontology_acronym: '',
                                        active_style: active_style, node: node)
@@ -235,7 +238,7 @@ def help_tooltip(content, html_attribs = {}, icon = 'fas fa-question-circle', cs
     attribs = []
     html_attribs.each {|k,v| attribs << "#{k.to_s}='#{v}'"}
     return <<-BLOCK
-          <a class='pop_window tooltip_link #{[css_class].flatten.compact.join(' ')}' #{attribs.join(" ")}>
+          <a data-controller='tooltip' class='pop_window tooltip_link d-inline-block #{[css_class].flatten.compact.join(' ')}' #{attribs.join(" ")}>
             <i class="#{icon} d-flex"></i> #{text}
           </a>
     BLOCK
@@ -329,6 +332,19 @@ def get_groups_data
     @groups_for_js = @groups_map.to_json
   end
 
+  def metadata_for_select
+    get_metadata
+    return @metadata_for_select
+  end 
+
+  def get_metadata
+    @metadata_for_select = []
+    submission_metadata.each do |data|
+      @metadata_for_select << data["attribute"]
+    end
+  end    
+
+
   def ontologies_to_acronyms(ontologyIDs)
     acronyms = []
     ontologyIDs.each do |id|
@@ -351,33 +367,44 @@ def truncate_with_more(text, options = {})
     output = "<span class='more_less_container'><span class='truncated_more'>#{truncate(text, :length => length, :omission => trailing_text)}" + more + "</span>"
   end
 
-  def subscribe_ontology_button(ontology_id, user = nil)
-    user = session[:user] if user.nil?
-    if user.nil?
-      # subscribe button must redirect to login
-      return sanitize("<a href='/login?redirect=#{request.url}' style='font-size: .9em;' class='subscribe_to_ontology'>Subscribe</a>")
+
+  def add_comment_button(parent_id, parent_type)
+    if session[:user].nil?
+      link_to "Add comment",  login_index_path(redirect: request.url), class: "link_button"
+    else
+      link_to_modal "Add comment", notes_new_comment_path(parent_id: parent_id, parent_type: parent_type, ontology_id: @ontology.acronym),
+                    class: "add_comment btn btn-primary", data: { show_modal_title_value: "Add a new comment"}
     end
-    # Init subscribe button parameters.
-    sub_text = "Subscribe"
-    params = "data-bp_ontology_id='#{ontology_id}' data-bp_is_subbed='false' data-bp_user_id='#{user.id}'"
-    begin
-      # Try to create an intelligent subscribe button.
-      if ontology_id.start_with? 'http'
-        ont = LinkedData::Client::Models::Ontology.find(ontology_id)
-      else
-        ont = LinkedData::Client::Models::Ontology.find_by_acronym(ontology_id).first
-      end
-      subscribed = subscribed_to_ontology?(ont.acronym, user)  # application_helper
-      sub_text = subscribed ? "Unsubscribe" : "Subscribe"
-      params = "data-bp_ontology_id='#{ont.acronym}' data-bp_is_subbed='#{subscribed}' data-bp_user_id='#{user.id}'"
-    rescue
-      # pass, fallback init done above begin block to scope parameters beyond the begin/rescue block
+  end
+
+  def add_reply_button(parent_id)
+    if session[:user].nil?
+      link_to "Reply", login_index_path, 'data-turbo': false
+    else
+      link_to 'Reply', notes_new_reply_path(parent_id: parent_id ), "data-turbo-frame": "#{parent_id}_new_reply"
     end
-    # TODO: modify/copy CSS for notes_sub_error => subscribe_error
-    # TODO: modify/copy CSS for subscribe_to_notes => subscribe_to_ontology
-    spinner = '<span class="subscribe_spinner" style="display: none;">' + image_tag("spinners/spinner_000000_16px.gif", style: "vertical-align: text-bottom;") + '</span>'
-    error = "<span style='color: red;' class='subscribe_error'></span>"
-    return "<a href='javascript:void(0);' class='subscribe_to_ontology btn btn-primary' #{params}>#{sub_text}</a> #{spinner} #{error}"
+  end
+
+
+  def add_proposal_button(parent_id, parent_type)
+    if session[:user].nil?
+        link_to "Add proposal",  login_index_path(redirect: request.url), class: "link_button"
+    else
+      link_to_modal "Add proposal", notes_new_proposal_path(parent_id: parent_id, parent_type: parent_type, ontology_id: @ontology.acronym),
+                    class: "add_proposal btn btn-primary", data: { show_modal_title_value: "Add a new proposal"}
+    end
+  end
+ 
+  def subscribe_button(ontology_id)
+    if session[:user].nil?
+      return link_to 'Subscribe to notes emails', "/login?redirect=#{request.url}", {style:'font-size: .9em;', class:'link_button'}
+    end
+
+    user = LinkedData::Client::Models::User.find(session[:user].id)
+    ontology_acronym = ontology_id.split('/').last
+    subscribed = subscribed_to_ontology?(ontology_acronym, user)
+
+    render OntologySubscribeButtonComponent.new(ontology_id: ontology_id, subscribed: subscribed, user_id: user.id)
   end
 
   def subscribed_to_ontology?(ontology_acronym, user)
@@ -435,9 +462,11 @@ def flash_class(level)
   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)}"
   end
+
   def bp_scheme_link(scheme_id, ont_acronym)
     return "#{bp_ont_link(ont_acronym)}?p=schemes&schemeid=#{escape(scheme_id)}"
   end
@@ -449,6 +478,7 @@ def bp_label_xl_link(label_xl_id, ont_acronym)
   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:
         {
@@ -538,6 +568,19 @@ def link_to_modal(name, options = nil, html_options = nil, &block)
       link_to(name, options, html_options)
     end
   end
+  def submit_to_modal(name, html_options = nil, &block)
+    new_data = {
+      controller: 'show-modal', turbo: true,
+      turbo_frame: 'application_modal_content',
+      action: 'click->show-modal#show'
+    }
+
+    html_options[:data].merge!(new_data) do |_, old, new|
+      "#{old} #{new}"
+    end
+
+    submit_tag(name || "save", html_options)
+  end
 
   def uri?(url)
     url =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w[http https])}\z/
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index dddf74d856..6c65c95fd6 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -129,34 +129,7 @@ def get_note_type_text(note_type)
       return "Change Property Value Proposal"
     end
   end
-
-  def subscribe_button(ontology_id)
-    user = session[:user]
-    if user.nil?
-      # subscribe button must redirect to login
-      return link_to 'Subscribe to notes emails', "/login?redirect=#{request.url}", {style:'font-size: .9em;', class:'link_button'}
-    end
-    # Init subscribe button parameters.
-    user = LinkedData::Client::Models::User.find(session[:user].id)
-    sub_text = "Subscribe"
-    params = "data-bp_ontology_id='#{ontology_id}' data-bp_is_subbed='false' data-bp_user_id='#{user.id}'"
-    begin
-      # Try to create an intelligent subscribe button.
-      if ontology_id.start_with? 'http'
-        ont = LinkedData::Client::Models::Ontology.find(ontology_id)
-      else
-        ont = LinkedData::Client::Models::Ontology.find_by_acronym(ontology_id).first
-      end
-      subscribed = subscribed_to_ontology?(ont.acronym, user)  # application_helper
-      sub_text = subscribed ? "Unsubscribe" : "Subscribe"
-      params = "data-bp_ontology_id='#{ont.acronym}' data-bp_is_subbed='#{subscribed}' data-bp_user_id='#{user.id}'"
-    rescue
-      # pass, fallback init done above begin block to scope parameters beyond the begin/rescue block
-    end
-    spinner = '<span class="notes_subscribe_spinner" style="display: none;">' + image_tag("spinners/spinner_000000_16px.gif", style: "vertical-align: text-bottom;") + '</span>'
-    error = "<span style='color: red;' class='notes_sub_error'></span>"
-    return "<a href='javascript:void(0);' class='subscribe_to_notes btn btn-primary' #{params}>#{sub_text} to notes emails</a> #{spinner} #{error}".html_safe
-  end
+  
 
   def delete_button
     user = session[:user]
diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb
index 16c9059322..6e43ba8193 100644
--- a/app/helpers/ontologies_helper.rb
+++ b/app/helpers/ontologies_helper.rb
@@ -28,9 +28,9 @@ def display_data_catalog(sub)
           sub.send("includedInDataCatalog").each do |catalog|
             catalog_btn_label = catalog
             $DATA_CATALOG_VALUES.each do |cat_uri, cat_label|
-              if catalog.start_with?(cat_uri)
+              if catalog[cat_uri]
                 catalog_btn_label = cat_label
-                break;
+                break
               end
             end
             concat(content_tag(:a, catalog_btn_label, { :class => "btn btn-primary", :href => catalog, :target => "_blank" }))
@@ -38,7 +38,7 @@ def display_data_catalog(sub)
         end)
       end
     else
-      return ""
+       ""
     end
   end
 
@@ -390,7 +390,7 @@ def lazy_load_section(section_title, &block)
     if current_section.eql?(section_title)
       block.call
     else
-      render TurboFrameComponent.new(id: section_title, src: "/ontologies/#{@ontology.acronym}?p=#{section_title}")
+      render TurboFrameComponent.new(id: section_title, src: "/ontologies/#{@ontology.acronym}?p=#{section_title}", target: '_top')
     end
   end
 
diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb
index 28a7b936a3..799e52b131 100644
--- a/app/helpers/schemes_helper.rb
+++ b/app/helpers/schemes_helper.rb
@@ -9,8 +9,10 @@ def get_scheme(ontology, scheme_uri)
   end
 
   def get_scheme_label(scheme)
+    return '' if scheme.nil?
+
     if scheme['prefLabel'].nil? || scheme['prefLabel'].empty?
-      extract_label_from(scheme['@id']).html_safe
+      extract_label_from(scheme['@id']).html_safe if scheme['@id']
     else
       scheme['prefLabel']
     end
diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
index 1ec67d9a2a..a9dc3d8b99 100644
--- a/app/helpers/submissions_helper.rb
+++ b/app/helpers/submissions_helper.rb
@@ -1,5 +1,265 @@
 module SubmissionsHelper
-  
+
+  def ontology_submission_id_label(acronym, submission_id)
+    [acronym, submission_id].join('#')
+  end
+  def ontology_and_submission_id(value)
+    value.split('#')
+  end
+
+  def render_submission_attribute(attribute, submission = @submission, ontology = @ontology)
+    render partial: 'ontologies_metadata_curator/attribute_inline_editable', locals: { attribute: attribute, submission: submission, ontology: ontology }
+  end
+
+  def render_submission_attribute_inline(attribute, submission = @submission, acronym)
+    render partial:"ontologies_metadata_curator/attribute_inline", locals:{attribute: attribute, submission: submission, acronym: acronym}
+  end
+
+  def attribute_input_frame_id(acronym, submission_id, attribute)
+    "submission[#{acronym}_#{submission_id}]#{attribute.capitalize}_from_group_input"
+  end
+
+  def display_submission_attributes(acronym, attributes, submissionId: nil, required: false, show_sections: false, inline_save: false)
+    @ontology = LinkedData::Client::Models::Ontology.find_by_acronym(acronym).first
+    @selected_attributes = attributes
+    @required_only = required
+    @hide_sections = !show_sections
+    @inline_save = inline_save
+
+    display_properties = @selected_attributes && !@selected_attributes.empty? ? (equivalent_properties(@selected_attributes) + [:ontology, :submissionId]).join(',') : 'all'
+    if submissionId
+      @submission = @ontology.explore.submissions({ display: display_properties }, submissionId)
+    else
+      @submission = @ontology.explore.latest_submission({ display: display_properties })
+    end
+  end
+
+  def metadata_section(id, label, collapsed: true, parent_id: nil, &block)
+    if @hide_sections
+      content_tag(:div) do
+        capture(&block)
+      end
+    else
+      collapsed = false unless @selected_attributes.nil?
+      render CollapsableBlockComponent.new(id: id, parent_id: (parent_id || "#{id}-card"), title: label, collapsed: collapsed) do
+        capture(&block)
+      end
+    end
+  end
+
+  def attribute_container(attr, required: false, &block)
+    if show_attribute?(attr, required)
+      content_tag(:div) do
+        capture(&block)
+      end
+    end
+  end
+
+  def inline_save?
+    !@inline_save.nil? && @inline_save
+  end
+
+  def selected_attribute?(attr)
+    @selected_attributes.nil? || @selected_attributes.empty? || @selected_attributes.include?(attr.to_s) || equivalent_properties(@selected_attributes).include?(attr.to_s)
+  end
+
+  def show_attribute?(attr, required)
+    selected = selected_attribute?(attr)
+    required_only = @required_only && required || !@required_only
+    selected && required_only
+  end
+
+  def save_button
+    content_tag :div do
+      button_tag({ data: { controller: 'tooltip' }, title: 'Save', class: 'btn btn-sm btn-light mx-1' }) do
+        content_tag(:i, "", class: 'fas fa-check')
+      end
+    end
+
+  end
+
+  def cancel_link(acronym: @ontology.acronym, submission_id: @submission.submissionId, attribute:)
+    "/ontologies_metadata_curator/#{acronym}/submissions/#{submission_id}/attributes/#{attribute}"
+  end
+
+  def cancel_button(href)
+    content_tag :div do
+      link_to(href, { data: { turbo: true, controller: 'tooltip', turbo_frame: '_self' }, title: 'Cancel', class: 'btn btn-sm btn-light mx-1' }) do
+        content_tag(:i, "", class: 'fas fa-times')
+      end
+    end
+  end
+
+  def attribute_form_group_container(attr, label: '', required: false, &block)
+    attribute_container(attr, required: required) do
+      render FormGroupComponent.new(object: @submission, name: object_name, method: attr, label: label, required: required) do |c|
+        if inline_save?
+          c.submit do
+            html = ''
+            html += save_button
+            html += cancel_button(cancel_link(attribute: attr))
+            html.html_safe
+          end
+        end
+
+        capture(c, &block)
+      end
+    end
+  end
+
+  def attribute_text_field_container(attr, label: '', required: false, inline: true, &block)
+    attribute_container(attr, required: required) do
+      render TextFieldComponent.new(object: @submission, name: object_name, label: label, method: attr, required: required, inline: inline) do |c|
+        if inline_save?
+          c.submit do
+            html = ''
+            html += save_button
+            html += cancel_button(cancel_link(attribute: attr))
+            html.html_safe
+          end
+        end
+
+        capture(c, &block) if block_given?
+      end
+    end
+  end
+
+  def sections
+    [['define-usage', 'Define usage', 'usage'], ['more-methodology-information', 'More methodology information', 'methodology'],
+     ['more-links', 'More links', 'links'], ['ontology-images', 'Ontology images', 'images']]
+  end
+
+  def format_equivalent
+    %w[hasOntologyLanguage prefLabelProperty synonymProperty definitionProperty authorProperty obsoleteProperty obsoleteParent]
+  end
+
+  def location_equivalent
+    %w[summaryOnly pullLocation]
+  end
+
+  def equivalent_property(attr)
+    equivalents = submission_properties
+
+    found = equivalents.select { |x| x.is_a?(Array) && x[0].eql?(attr.to_sym) }
+    found.empty? ?  attr.to_sym: found.first[1]
+  end
+
+  def equivalent_properties(attr_labels)
+    labels = Array(attr_labels)
+
+    labels.map { |x| equivalent_property(x) }.flatten
+  end
+
+  def submission_properties
+    out = [
+      [:format, format_equivalent],
+      :version,
+      :status,
+      [:location, location_equivalent],
+      :URI,
+      :deprecated,
+      :hasOntologySyntax,
+      :hasFormalityLevel,
+      :isOfType,
+      :naturalLanguage,
+      :description,
+      :homepage,
+      :documentation,
+      :publication,
+      :usedOntologyEngineeringTool,
+      :abstract, :notes, :keywords, :alternative, :identifier,
+      :knownUsage,
+      :designedForOntologyTask,
+      :hasDomain,
+      :coverage,
+      :example,
+      :conformsToKnowledgeRepresentationParadigm,
+      :usedOntologyEngineeringMethodology,
+      :accrualMethod,
+      :accrualPeriodicity,
+      :accrualPolicy,
+      :competencyQuestion,
+      :versionIRI,
+      :source,
+      :isFormatOf,
+      :hasFormat,
+      :includedInDataCatalog,
+      :depiction,
+      :logo,
+      :associatedMedia,
+      :released,
+      :modificationDate,
+      :valid,
+      :curatedOn,
+      :publisher,
+      :hasLicense,
+      :morePermissions,
+      :copyrightHolder,
+      :contact,
+      :hasContributor,
+      :hasCreator,
+      :audience,
+      :toDoList,
+      :useGuidelines,
+      :repository,
+      :bugDatabase,
+      :mailingList,
+      :award,
+      :wasGeneratedBy,
+      :wasInvalidatedBy,
+      :curatedBy,
+      :endorsedBy,
+      :fundedBy,
+      :translator,
+      :useImports,
+      :hasPriorVersion,
+      :isAlignedTo,
+      :ontologyRelatedTo,
+      :isBackwardCompatibleWith,
+      :isIncompatibleWith,
+      :comesFromTheSameDomain,
+      :similarTo,
+      :explanationEvolution,
+      :generalizes,
+      :hasDisparateModelling,
+      :hasPart,
+      :usedBy,
+      :workTranslation,
+      :translationOfWork,
+      :preferredNamespacePrefix,
+      :preferredNamespaceUri,
+      :keyClasses,
+      :endpoint,
+      :dataDump,
+      :csvDump,
+      :openSearchDescription,
+      :uriLookupEndpoint,
+      :uriRegexPattern,
+      :metadataVoc,
+      :exampleIdentifier,
+      :numberOfClasses,
+      :numberOfIndividuals,
+      :numberOfProperties,
+      :entities,
+      :numberOfAxioms
+    ]
+    out.uniq
+  end
+
+  def submission_editable_properties
+
+    properties = submission_properties
+
+    properties.map do |x|
+      if x.is_a? Array
+        [x[0].to_s.underscore.humanize, x[0]]
+      else
+        [x.to_s.underscore.humanize, x]
+      end
+    end
+
+  end
+
   def extractable_metadatum_tooltip(options = {})
     help_tooltip(options[:content], {}, 'fas fa-file-export', 'extractable-metadatum', options[:text]).html_safe
   end
@@ -30,18 +290,24 @@ def attribute_help_text(attr)
     end
     help_text
   end
+
   # Generate the HTML label for every attributes
-  def generate_attribute_label(attr_label)
+  def generate_attribute_label(attr_label, label_tag_sym: :label)
     # Get the attribute hash corresponding to the given attribute
     attr = attribute_infos(attr_label)
+
+    return attr_label if attr.nil?
+
     label_html = if !attr["extracted"].nil? && attr["extracted"] == true
-      extractable_metadatum_tooltip({ content: 'Extractable metadatum' })
-    end.to_s.html_safe
+                   extractable_metadatum_tooltip({ content: 'Extractable metadatum' })
+                 end.to_s.html_safe
 
-    if !attr["label"].nil?
-      label_html << label_tag("submission_#{attr_label}", attr["label"], { class: 'form-label' })
+    label = attr["label"].nil? ? attr_label.underscore.humanize : attr["label"]
+
+    if label_tag_sym.eql? :label
+      label_html << label_tag("submission_#{attr_label}", label , { class: 'form-label' })
     else
-      label_html << label_tag("submission_#{attr_label}", attr_label.underscore.humanize, { class: 'form-label' })
+      label_html << content_tag(label_tag_sym, label, {class: 'form-label'})
     end
 
     # Generate tooltip
@@ -50,195 +316,142 @@ def generate_attribute_label(attr_label)
     label_html
   end
 
-  # Generate the HTML input for every attributes.
-  def generate_attribute_input(attr_label, options = {})
-    input_html = ''.html_safe
-
-    # Get the attribute hash corresponding to the given attribute
-    attr = @metadata.select{ |attr_hash| attr_hash["attribute"].to_s.eql?(attr_label) }.first
-
-    if attr["enforce"].include?("integer")
-      number_field :submission, attr["attribute"].to_s.to_sym, value: @submission.send(attr["attribute"]), class: 'metadataInput form-control'
-
-    elsif attr["enforce"].include?("date_time")
-      field_id = [:submission, attr["attribute"].to_s].join('_')
-      date_value = @submission.send(attr["attribute"]).presence
-      date_value &&= Date.parse(date_value)
-      date_value ||= options[:default]
-      date_value &&= l(date_value, format: :month_day_year)
-      
-      content_tag(:div, class: 'input-group') do
-        [
-          text_field(:submission, attr["attribute"].to_s.to_sym, value: date_value, id: field_id, class: "form-control datepicker"),
-          content_tag(:div, class: 'input-group-append') do
-            content_tag(:span, class: 'input-group-text datepicker-btn', onclick: "$('##{field_id}').datepicker('show')") do
-              content_tag(:i, '', class: 'fas fa-calendar-alt fa-l')
-            end
-          end
-        ].join.html_safe
-      end
-
-    elsif attr["enforce"].include?("textarea")
-      text_area(:submission, attr["attribute"].to_s.to_sym, rows: 3, value: @submission.send(attr["attribute"]), class: 'metadataInput form-control')
-
-    # Create select dropdown when there are enforcedValues for the attr. But also let the user enter its own value if Other selected
-    elsif !attr["enforcedValues"].nil?
-      metadata_values = @submission.send(attr["attribute"])
-      select_values = attr["enforcedValues"].collect{ |k, v| [v,k]}
-      # Add in the select ontologies that are not in the portal but are in the values
-      if metadata_values.kind_of?(Array)
-        metadata_values.map do |metadata|
-          if !select_values.flatten.include?(metadata)
-            select_values << metadata
-          end
-        end
-      else
-        if (!select_values.flatten.include?(metadata_values) && !metadata_values.to_s.empty?)
-          select_values << metadata_values
-        end
-      end
+  def object_name(acronym= @ontology.acronym, submissionId= @submission.submissionId)
+    "submission[#{acronym}_#{submissionId}]"
+  end
 
-      if attr["enforce"].include?("list")
-        input_html << select_tag("submission[#{attr_label}][]", options_for_select(select_values, metadata_values), :multiple => 'true',
-                                 "data-placeholder".to_sym => "Select ontologies", :style => "margin-bottom: 15px; width: 100%;", :id => "select_#{attr["attribute"]}", :class => "selectOntology")
+  def attribute_input_name(attr_label)
+    object_name_val = object_name
+    name = "#{object_name_val}[#{attr_label}]"
+    [object_name_val, name]
+  end
 
-        input_html << text_field_tag("add_#{attr["attribute"].to_s}", nil, :style => "margin-right: 1em;width: 16em;", :placeholder => "Or provide the value",
-                                     :onkeydown => "if (event.keyCode == 13) { addOntoToSelect('#{attr["attribute"]}'); return false;}", :class => 'metadataInput form-control')
+  def generate_integer_input(attr)
+    number_field object_name, attr["attribute"].to_s.to_sym, value: @submission.send(attr["attribute"]), class: 'metadataInput form-control'
+  end
 
-        input_html << button_tag("Add new value", :id => "btnAdd#{attr["attribute"]}",
-                                 :type => "button", :class => "btn btn-primary btn-sm add-value-btn", :onclick => "addOntoToSelect('#{attr["attribute"]}')")
+  def generate_date_input(attr)
+    field_id = [:submission, attr["attribute"].to_s, @ontology.acronym].join('_')
+    date_value = @submission.send(attr["attribute"]).presence
+    data_flat_picker = { controller: "flatpickr", flatpickr_date_format: "Y-m-d", flatpickr_alt_input: "true", flatpickr_alt_format: "F j, Y" }
+    content_tag(:div, class: 'input-group') do
+      [
+        date_field(object_name, attr["attribute"].to_s.to_sym, value: date_value, id: field_id, data: data_flat_picker, class: "not-disabled")
+      ].join.html_safe
+    end
+  end
 
-      else
+  def generate_textarea_input(attr)
+    text_area(object_name, attr["attribute"].to_s.to_sym, rows: 3, value: @submission.send(attr["attribute"]), class: 'metadataInput form-control')
+  end
 
-        select_values << ["None", ""]
-        select_values << ["Other", "other"]
+  def generate_select_input(attr, name, select_values, metadata_values, multiple: false)
+    id = attr["attribute"].to_s + "_" + @ontology.acronym
+    render SelectInputComponent.new(id: id, name: name, values: select_values , selected: metadata_values , multiple: multiple)
+  end
 
-        if metadata_values.nil?
-          metadata_values = ""
+  def generate_list_field_input(attr, name, values, field_func)
+    render NestedFormInputsComponent.new do |c|
+      c.template do
+        method(field_func).call("#{name}[NEW_RECORD]", '', :id => attr["attribute"].to_s + "_" + @ontology.acronym, class: "metadataInput form-control my-1")
+      end
+      values.each_with_index do |metadata_val, i|
+        c.row do
+          method(field_func).call("#{name}[#{i}]", metadata_val, :id => "submission_#{attr["attribute"].to_s}" + "_" + @ontology.acronym, class: "metadataInput my-1 form-control")
         end
-
-        input_html << select("submission", attr["attribute"], select_values, { :selected => metadata_values}, {:class => "form-control", :id => "select_#{attr["attribute"]}", :style=> "margin-bottom: 1em;"})
-
-        # Button and field to add new value (that are not in the select). Show when other is selected
-        input_html << text_field_tag("add_#{attr["attribute"].to_s}", nil, :style => "margin-right: 1em;width: 16em;display: none;", :placeholder => "Or provide the value",
-                                     :onkeydown => "if (event.keyCode == 13) { addValueToSelect('#{attr["attribute"]}'); return false;}", :class => 'metadataInput form-control')
-
-        input_html << button_tag("Add new value", :id => "btnAdd#{attr["attribute"]}",
-                                 :type => "button", :class => "btn btn-primary btn-sm add-value-btn", :onclick => "addValueToSelect('#{attr["attribute"]}')")
-
-        # To show/hide textbox when other option is selected or not
-        input_html << javascript_tag("$(document).ready(function() {
-            $('#select_#{attr["attribute"]}').change(function() {
-              toggleOtherValue('#{attr["attribute"].to_s}');
-            });
-            toggleOtherValue('#{attr["attribute"].to_s}');
-          })")
       end
+    end
+  end
 
+  def generate_url_input(attr, name, values)
+    generate_list_field_input(attr, name, values, :url_field_tag)
+  end
 
-      return input_html
+  def generate_list_text_input(attr, name, values)
+    generate_list_field_input(attr, name, values, :text_field_tag)
+  end
 
+  def generate_boolean_input(attr, name)
+      value = attribute_values(attr)
+    value = value.to_s unless value.nil?
 
-    elsif attr["enforce"].include?("isOntology")
-      metadata_values = @submission.send(attr["attribute"])
-      select_values = ontologies_for_select.dup
-      # Add in the select ontologies that are not in the portal but are in the values
-      if metadata_values.kind_of?(Array)
-        metadata_values.map do |metadata|
-          if !select_values.flatten.include?(metadata)
-            select_values << metadata
-          end
-        end
-      else
+    render SwitchInputComponent.new(id: name, name:  name, label: "", checked: value.eql?('true') , value: value, boolean_switch: true)
+  end
 
-        if !select_values.flatten.include?(metadata_values)
-          select_values << metadata_values
-        end
-      end
+  def input_type?(attr, type)
+    attr["enforce"].include?(type)
+  end
 
-      if attr["enforce"].include?("list")
-        input_html << select_tag("submission[#{attr_label}][]", options_for_select(select_values, metadata_values), :multiple => 'true',
-            "data-placeholder".to_sym => "Select ontologies", :style => "margin-bottom: 15px; width: 100%;", :id => "select_#{attr["attribute"]}", :class => "selectOntology")
+  def enforce_values?(attr)
+    !attr["enforcedValues"].nil?
+  end
 
-      else
-        input_html << select_tag("submission[#{attr_label}]", options_for_select(select_values, metadata_values), "data-placeholder".to_sym => "Select ontology",
-                   :style => "margin-bottom: 15px; width: 100%;", :id => "select_#{attr["attribute"]}", :class => "selectOntology", :include_blank => true)
-      end
-      # Button and field to add new value (not in the select)
-      input_html << tag(:br)
+  def attribute_values(attr)
+    begin
+      @submission.send(attr["attribute"])
+    rescue
+      nil
+    end
+  end
 
-      input_html << text_field_tag("add_#{attr["attribute"]}", nil, :style => "margin-right: 1em;vertical-align: super;width: 16em; display: inline",
-                                   :placeholder => "Ontology outside of the Portal", :onkeydown => "if (event.keyCode == 13) { addOntoToSelect('#{attr["attribute"]}'); return false;}", :class => 'metadataInput form-control')
+  # Generate the HTML input for every attributes.
+  def generate_attribute_input(attr_label, options = {})
+    input_html = ''.html_safe
 
-      input_html << button_tag("Add new ontology", :id => "btnAdd#{attr["attribute"]}", :style => "margin-bottom: 2em;margin-top: 1em;",
-                               :type => "button", :class => "btn btn-primary btn-sm", :onclick => "addOntoToSelect('#{attr["attribute"]}')")
+    # Get the attribute hash corresponding to the given attribute
+    attr = @metadata.select { |attr_hash| attr_hash["attribute"].to_s.eql?(attr_label) }.first
+
+    object_name, name = attribute_input_name(attr["attribute"])
+
+    if input_type?(attr, 'integer')
+      generate_integer_input(attr)
+    elsif input_type?(attr, 'date_time')
+      generate_date_input(attr)
+    elsif input_type?(attr, 'textarea')
+      generate_textarea_input(attr)
+    elsif enforce_values?(attr)
+      metadata_values, select_values = selected_values(attr, enforced_values(attr))
+      if input_type?(attr, "list")
+        input_html << generate_select_input(attr, name, select_values, metadata_values, multiple: true)
+      else
+        select_values << ["", ""]
+        select_values << %w[Other other]
 
-      return input_html
+        metadata_values = "" if metadata_values.nil?
 
-    elsif attr["enforce"].include?("uri")
-      if @submission.send(attr["attribute"]).nil?
-        uri_value = ""
-      else
-        uri_value = @submission.send(attr["attribute"])
+        input_html << generate_select_input(attr, name, select_values, metadata_values)
       end
 
-      if attr["enforce"].include?("list")
-        input_html << button_tag("Add new value", :id => "add#{attr["attribute"]}",
-                                 :type => "button", :class => "btn btn-primary btn-sm add-value-btn", :onclick => "addInput('#{attr["attribute"]}', 'url')")
-        input_html << url_field_tag("submission[#{attr["attribute"].to_s}][]", uri_value[0], :id => attr["attribute"].to_s, class: "metadataInput form-control")
-        # Add field if list of URI
-        if !@submission.send(attr["attribute"]).nil? && @submission.send(attr["attribute"]).any?
-          @submission.send(attr["attribute"]).each_with_index do |metadata_val, index|
-            if index != 0
-              input_html << url_field_tag("submission[#{attr["attribute"].to_s}][]", metadata_val, :id => "submission_#{attr["attribute"].to_s}", class: "metadataInput form-control")
-            end
-          end
-        end
-        input_html << content_tag(:div, "", id: "#{attr["attribute"]}Div")
-
+      return input_html
+    elsif input_type?(attr, 'isOntology')
+      metadata_values, select_values = selected_values(attr, ontologies_for_select.dup)
+      input_html << generate_select_input(attr, name, select_values, metadata_values, multiple: attr["enforce"].include?("list"))
+      return input_html
+    elsif input_type?(attr, "uri")
+      uri_values = attribute_values(attr) || ['']
+      if input_type?(attr, "list")
+        input_html << generate_url_input(attr, name, uri_values)
       else
-        # if single value
-        input_html << text_field(:submission, attr["attribute"].to_s.to_sym, value: uri_value, class: "metadataInput form-control")
+        input_html << text_field(object_name, attr["attribute"].to_s.to_sym, value: Array(uri_values).first, class: "metadataInput form-control")
       end
       return input_html
-
-    elsif attr["enforce"].include?("boolean")
-      select("submission", attr["attribute"].to_s, ["none", "true", "false"], { :selected => @submission.send(attr["attribute"])},
-             {:class => "form-control", :style => "margin-top: 0.5em; margin-bottom: 0.5em;"})
-
+    elsif input_type?(attr, "boolean")
+      input_html << generate_boolean_input(attr, name)
     else
       # If input a simple text
-
-      if attr["enforce"].include?("list")
-        input_html << button_tag("Add new value", :id => "add#{attr["attribute"]}",
-                                 :type => "button", :class => "btn btn-primary btn-sm add-value-btn", :onclick => "addInput('#{attr["attribute"]}', 'text')")
-        firstVal = ""
-        if !@submission.send(attr["attribute"]).nil? && @submission.send(attr["attribute"]).any?
-          firstVal = @submission.send(attr["attribute"])[0]
-        end
-        input_html << text_field_tag("submission[#{attr["attribute"].to_s}][]", firstVal, :id => attr["attribute"].to_s, class: "metadataInput form-control")
-
-        # Add field if list of metadata
-        if !@submission.send(attr["attribute"]).nil? && @submission.send(attr["attribute"]).any?
-          @submission.send(attr["attribute"]).each_with_index do |metadata_val, index|
-            if index != 0
-              input_html << text_field_tag("submission[#{attr["attribute"].to_s}][]", metadata_val, :id => "submission_#{attr["attribute"].to_s}", class: "metadataInput form-control")
-            end
-          end
-        end
-
-        input_html << content_tag(:div, "", id: "#{attr["attribute"]}Div")
-
+      values = attribute_values(attr) || ['']
+      if input_type?(attr, "list")
+        input_html << generate_list_text_input(attr, name, values)
       else
         # if single value text
         # TODO: For some reason @submission.send("URI") FAILS... I don't know why... so I need to call it manually
         if attr["attribute"].to_s.eql?("URI")
-          input_html << text_field(:submission, attr["attribute"].to_s.to_sym, value: @submission.URI, class: "metadataInput form-control")
+          input_html << text_field(object_name, attr["attribute"].to_s.to_sym, value: @submission.URI, class: "metadataInput form-control")
         else
-          input_html << text_field(:submission, attr["attribute"].to_s.to_sym, value: @submission.send(attr["attribute"]), class: "metadataInput form-control")
+          input_html << text_field(object_name, attr["attribute"].to_s.to_sym, value: @submission.send(attr["attribute"]), class: "metadataInput form-control")
         end
       end
-      return input_html
+      input_html
     end
   end
 
@@ -253,11 +466,49 @@ def generate_attribute_text(attr_label , label)
     label_html.html_safe
   end
   def ontologies_for_select
-    
     @ontologies_for_select ||= LinkedData::Client::Models::Ontology.all.collect do |onto|
       ["#{onto.name} (#{onto.acronym})", onto.id]
     end
-    
   end
-  
+
+  def form_group_attribute(attr, options = {}, &block)
+    attribute_form_group_container(attr, required: !options[:required].nil?) do |c|
+      c.label do
+        generate_attribute_label(attr)
+      end
+      c.input do
+        raw generate_attribute_input(attr, options)
+      end
+      if block_given?
+        c.help do
+          capture(&block)
+        end
+      end
+    end
+  end
+
+  private
+
+  def enforced_values(attr)
+    attr["enforcedValues"].collect { |k, v| [v, k] }
+  end
+
+  def selected_values(attr, enforced_values)
+    metadata_values = attribute_values(attr)
+    select_values = enforced_values
+
+    if metadata_values.kind_of?(Array)
+      metadata_values.map do |metadata|
+        unless select_values.flatten.include?(metadata)
+          select_values << metadata
+        end
+      end
+    else
+      if !select_values.flatten.include?(metadata_values) && !metadata_values.to_s.empty?
+        select_values << metadata_values
+      end
+    end
+    [metadata_values, select_values]
+  end
+
 end
\ No newline at end of file
diff --git a/app/helpers/turbo_helper.rb b/app/helpers/turbo_helper.rb
index a0bdfaf754..3e1f71155f 100644
--- a/app/helpers/turbo_helper.rb
+++ b/app/helpers/turbo_helper.rb
@@ -7,30 +7,35 @@ def alerts_container_id(id = nil)
     frame_id(id || controller_name, 'alerts_container')
   end
 
-  def alert(type: 'success', &block)
-    turbo_stream.prepend(alerts_container_id) do
+  def alert(id: nil, type: 'success', &block)
+    turbo_stream.prepend(id ||alerts_container_id) do
       AlertMessageComponent.new(type: type).render_in(view_context, &block)
     end
   end
 
-  def alert_error(&block)
-    alert(type:'danger', &block)
+  def alert_error(id: nil, &block)
+    alert(id: id, type:'danger', &block)
   end
-  def alert_success(&block)
-    alert(type:'success', &block)
+  def alert_success(id: nil, &block)
+    alert(id: id, type:'success', &block)
   end
-  def prepend(id, options, &block)
+  def prepend(id, options = {}, &block)
     turbo_stream.prepend(id, options, &block)
   end
   def replace(id, options = {}, &block)
     turbo_stream.replace(id, options, &block)
   end
+
+  def remove(id)
+    turbo_stream.remove(id)
+  end
   def render_turbo_stream(*streams)
     render turbo_stream: streams
   end
 
   def render_alerts_container(controller_class = nil)
-    render AlertsContainerComponent.new(id: alerts_container_id(controller_class&.controller_name))
+    id = controller_class.is_a?(String) ? controller_class : alerts_container_id(controller_class&.controller_name)
+    render AlertsContainerComponent.new(id:  id)
   end
 
 end
\ No newline at end of file
diff --git a/app/javascript/application_esbuild.js b/app/javascript/application_esbuild.js
index a6ef550971..a939c36c99 100644
--- a/app/javascript/application_esbuild.js
+++ b/app/javascript/application_esbuild.js
@@ -1,6 +1,18 @@
 // Entry point for the build script in your package.json
+
+
+import { Turbo } from "@hotwired/turbo-rails"
+Turbo.session.drive = false
 import "./controllers"
 import "./component_controllers"
 
-import { Turbo } from "@hotwired/turbo-rails"
-Turbo.session.drive = false
\ No newline at end of file
+
+Turbo.setConfirmMethod((message) => {
+    return new Promise((resolve, reject) => {
+        alertify.confirm(message, (e) => {
+            resolve(e)
+        })
+    })
+})
+
+
diff --git a/app/javascript/component_controllers/index.js b/app/javascript/component_controllers/index.js
index 50b5c84722..dc1edde165 100644
--- a/app/javascript/component_controllers/index.js
+++ b/app/javascript/component_controllers/index.js
@@ -4,5 +4,15 @@ import TurboModalController from "../../components/turbo_modal_component/turbo_m
 import FileInputLoaderController
     from "../../components/file_input_loader_component/file_input_loader_component_controller";
 
+import Select_input_component_controller
+    from "../../components/select_input_component/select_input_component_controller";
+import Metadata_selector_component_controller
+    from "../../components/metadata_selector_component/metadata_selector_component_controller";
+import Ontology_subscribe_button_component_controller
+    from "../../components/ontology_subscribe_button_component/ontology_subscribe_button_component_controller";
+
 application.register("turbo-modal", TurboModalController)
-application.register("file-input", FileInputLoaderController)
\ No newline at end of file
+application.register("file-input", FileInputLoaderController)
+application.register("select-input", Select_input_component_controller)
+application.register("metadata-select", Metadata_selector_component_controller)
+application.register("subscribe-notes", Ontology_subscribe_button_component_controller)
diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js
index 1213e85c7a..258ab85b4c 100644
--- a/app/javascript/controllers/application.js
+++ b/app/javascript/controllers/application.js
@@ -6,4 +6,13 @@ const application = Application.start()
 application.debug = false
 window.Stimulus   = application
 
+
+import Flatpickr from "stimulus-flatpickr"
+
+application.register("flatpickr", Flatpickr);
+import NestedForm from 'stimulus-rails-nested-form'
+application.register('nested-form', NestedForm)
+
 export { application }
+
+
diff --git a/app/javascript/controllers/turbo_frame_error_controller.js b/app/javascript/controllers/turbo_frame_error_controller.js
index ca596943f2..b19c63c129 100644
--- a/app/javascript/controllers/turbo_frame_error_controller.js
+++ b/app/javascript/controllers/turbo_frame_error_controller.js
@@ -12,6 +12,7 @@ export default class extends Turbo_frame_controller {
   showError(event) {
     let response = event.detail.fetchResponse
     if (!response.succeeded) {
+      event.preventDefault()
       response = response.response.clone()
       response.text().then(text => {
           this.#hideContent()
diff --git a/app/javascript/mixins/useTooltip.js b/app/javascript/mixins/useTooltip.js
index c029544891..46b44dc3e1 100644
--- a/app/javascript/mixins/useTooltip.js
+++ b/app/javascript/mixins/useTooltip.js
@@ -1,3 +1,3 @@
 export default function useTooltip(elem){
-    $(elem).tooltipster({theme: 'tooltipster-shadow'})
+    $(elem).tooltipster({theme: 'tooltipster-shadow', contentAsHTML: true})
 }
\ No newline at end of file
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
new file mode 100644
index 0000000000..f2961e12cd
--- /dev/null
+++ b/app/mailers/application_mailer.rb
@@ -0,0 +1,5 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'noreply@lirmm.com'
+  # layout 'mailer'
+end
+
diff --git a/app/models/notifier.rb b/app/mailers/notifier.rb
similarity index 73%
rename from app/models/notifier.rb
rename to app/mailers/notifier.rb
index 8250a845e1..7d517cf8f1 100644
--- a/app/models/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,7 +1,4 @@
-class Notifier < ActionMailer::Base
-  def signup(user)
-
-  end
+class Notifier < ApplicationMailer
 
   def lost_password(user, password)
     # Email header info MUST be added here
@@ -27,24 +24,20 @@ def endlessloop(node)
     body :node => node.inspect
   end
 
-  def feedback(name, email, comment, location = "")
+  def feedback(name, email, comment, location, tags)
     @name = name
     @email = email
     @comment = comment
     @location = location
+    @tags = tags
 
     mail(:to => "#{$SUPPORT_EMAIL}, #{email}",
          :from => "#{$SUPPORT_EMAIL}",
          :subject => "[#{$SITE}] Feedback from #{name}")
   end
 
-  def register_for_announce_list(email)
-    unless $ANNOUNCE_LIST.nil? || $ANNOUNCE_LIST.empty?
-      recipients "#{$ANNOUNCE_LIST}"
-      from "#{$ADMIN_EMAIL}"
-      subject "subscribe address=#{email}"
-    end
-  end
+  def signup(user)
 
+  end
 
 end
diff --git a/app/mailers/subscribe_mailer.rb b/app/mailers/subscribe_mailer.rb
new file mode 100644
index 0000000000..c80a4538eb
--- /dev/null
+++ b/app/mailers/subscribe_mailer.rb
@@ -0,0 +1,42 @@
+class SubscribeMailer < ApplicationMailer
+    
+    def register_for_announce_list(email,firstName,lastName)
+      if subscription_configs_valid?
+        if $ANNOUNCE_LIST_SERVICE.upcase.eql? "SYMPA"
+          mail(
+            :to => $ANNOUNCE_SERVICE_HOST, 
+            :from => email, 
+            :subject => "subscribe #{$ANNOUNCE_LIST} #{firstName} #{lastName}") 
+          end  
+          
+          mail(
+            :to => $SUPPORT_EMAIL, 
+            :from => email, 
+            :subject => "#{email} has been subscribe to our user mailing list #{$ANNOUNCE_LIST}")
+        end
+      end
+       
+    def unregister_for_announce_list(email)
+      if subscription_configs_valid?
+        if $ANNOUNCE_LIST_SERVICE.upcase.eql? "SYMPA"
+          mail(
+            :to => $ANNOUNCE_SERVICE_HOST, 
+            :from => email, 
+            :subject => "unsubscribe #{$ANNOUNCE_LIST}")
+        end
+
+        mail(
+          :to => $SUPPORT_EMAIL, 
+          :from => email, 
+          :subject => "#{email} has been unsubscribe from our user mailing list #{$ANNOUNCE_LIST}")
+      end  
+    end
+    
+
+    private
+
+    def subscription_configs_valid?
+      $ANNOUNCE_SERVICE_HOST.present? &&  $ANNOUNCE_LIST_SERVICE.present? && $ANNOUNCE_LIST.present? 
+    end
+    
+end
diff --git a/app/views/admin/index.html.haml b/app/views/admin/index.html.haml
index 5f1a7ab7ab..38bc1a3e5b 100644
--- a/app/views/admin/index.html.haml
+++ b/app/views/admin/index.html.haml
@@ -23,6 +23,8 @@
         =link_to("Licensing", "#licensing", id: "licensing-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: admin_licenses_path() }, aria: { controls: "licensing", selected: "false" })
       %li.nav-item
         =link_to("Users", "#users", id: "users-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab", href: users_path() }, aria: { controls: "users", selected: "false" })
+      %li.nav-item
+        =link_to("Metadata Administration", "#ontologies_metadata_curator", id: "ontologies_metadata_curator-admin-tab", class: "nav-link", role: "tab", data: { toggle: "tab"}, aria: { controls: "ontologies_metadata_curator", selected: "false" })   
     %div#adminTabContent.tab-content
 
       -# Site Administration tab
@@ -88,3 +90,11 @@
       %div.tab-pane.fade{id: "users", role: "tabpanel", aria: { labelledby: "users-admin-tab" }}
         %div.ontologies_list_container.mt-3
           %table#adminUsers.zebra{:cellpadding => "0", :cellspacing => "0", :width => "100%"}
+      
+      -# metadata tab
+      %div.tab-pane.fade{id: "ontologies_metadata_curator", role: "tabpanel", aria: { labelledby: "ontologies_metadata_curator-admin-tab" }}
+        = render partial: 'ontologies_metadata_curator/metadata_tab'
+
+
+
+  
\ No newline at end of file
diff --git a/app/views/concepts/_show.html.haml b/app/views/concepts/_show.html.haml
index b101aebcdd..71f02f9a30 100644
--- a/app/views/concepts/_show.html.haml
+++ b/app/views/concepts/_show.html.haml
@@ -32,7 +32,7 @@
             )
 
         %li#restlink_top.nav-item
-          %a.nav-link.py-1{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}", :style => "margin-bottom: 1em; margin-left: 1em;", :target => "_blank"} Access #{concept_label_to_show(submission: @submission)} JSON
+          %a.nav-link.py-1{:href => "#{@ontology.id}/classes/#{escape(@concept.id)}?display=all", :style => "margin-bottom: 1em; margin-left: 1em;", :target => "_blank"} Access #{concept_label_to_show(submission: @submission)} JSON
         - if @enable_ontolobridge
           %li#request_term_top.nav-item
             %a.nav-link.py-1{:href => "#request_term", data:{toggle: 'tab', target: '#request_term'}}
diff --git a/app/views/fair_score/_details.html.haml b/app/views/fair_score/_details.html.haml
index 6736eba8b0..7d3181b59e 100644
--- a/app/views/fair_score/_details.html.haml
+++ b/app/views/fair_score/_details.html.haml
@@ -1,123 +1,120 @@
-:javascript
-  let scrollY = window.getScrollTop()
-  $(document).ready(function(){
-    $("#fair-details-content").scrollspy({
-        target: "#fair-navbar",
-        offset: 0
-    })
+= turbo_frame_tag 'application_modal_content' do
+  :javascript
+    var scrollY = window.getScrollTop()
+    $(document).ready(function(){
+      $("#fair-details-content").scrollspy({
+          target: "#fair-navbar",
+          offset: 0
+      })
 
-    $("#fair-details-content").on('activate.bs.scrollspy', function (e) {
-      window.scrollTo(0,scrollY)
-    })
+      $("#fair-details-content").on('activate.bs.scrollspy', function (e) {
+        window.scrollTo(0,scrollY)
+      })
 
-  });
+    });
 
 
-- if  @fair_scores_data
-  %div{style:"font-size:14px"}
-    %div.row
-      %div.col-3.navbar.navbar-light.bg-light{id:"fair-navbar" ,style:"overflow: scroll;height: 70vh;position: relative"}
-        %h1
-          FAIRness assessment questions
-        %nav.nav.nav-pills.flex-column
-          - @fair_scores_data[:criteria][:labels].each_with_index  do |label , index|
-            %a.nav-link{href:"#"+get_name_with_out_dot(label)}
-              =label
-            %nav.nav.pills.flex-column
-              - @fair_scores_data[:criteria][:questions][index].each do |question|
-                %a.nav-link.my-1.ml-3.text-dark{href:"#"+get_name_with_out_dot(question[0])}
-                  =question[0]
-      %div.col-9#fair-details-content{style:"overflow: scroll;height: 70vh"}
-        %div.alert.alert-light
-          - mod_link =link_to "MOD1.4", "https://github.com/sifrproject/MOD-Ontology"
-          - submission_link =link_to "see the used properties",@rest_uri, target: "_blank"
-          %div
-            Metadata properties listed in the following are picked from #{mod_link}.
-          %div
-            This ontology repository implements #{mod_link} but does not necessity encode a metadata with the same properties (#{submission_link})
-        %div{style:"margin-bottom:400px"}
-          - @fair_scores_data[:criteria][:labels].each_with_index  do |label , index|
-            %div.my-3.border{id:get_name_with_out_dot(label)}
-              %div.py-3.px-4
-                %h5.criterion-score-container
-                  %div
-                    = label +': '+ @fair_scores_data[:criteria][:descriptions][index]
-                  %div.progress.criterion-score-progress-bar
-                    - if @fair_scores_data[:criteria][:normalizedScores][index] > 0
-                      %div.progress-bar.bg-obtained_color{style:"width:#{@fair_scores_data[:criteria][:normalizedScores][index]}%"}
-                        #{@fair_scores_data[:criteria][:scores][index]} (#{@fair_scores_data[:criteria][:normalizedScores][index].round()}%)
+  - if  @fair_scores_data
+    %div{style:"font-size:14px"}
+      %div.row.px-1
+        %div.col-3.navbar.navbar-light.bg-light.border{id:"fair-navbar" ,style:"overflow: scroll;height: 70vh;position: relative"}
+          %nav.nav.nav-pills.flex-column
+            - @fair_scores_data[:criteria][:labels].each_with_index  do |label , index|
+              = link_to label, "#"+get_name_with_out_dot(label) , data: {turbo: false}, class: "nav-link"
+              %nav.nav.pills.flex-column
+                - @fair_scores_data[:criteria][:questions][index].each do |question|
+                  = link_to question[0], "#"+get_name_with_out_dot(question[0]), data: {turbo: false}, class: "nav-link my-1 ml-3 text-dark"
+        %div.col-9#fair-details-content{style:"overflow: scroll;height: 70vh"}
+          %div.alert.alert-light
+            - mod_link =link_to "MOD1.4", "https://github.com/sifrproject/MOD-Ontology"
+            - submission_link =link_to "see the used properties",@rest_uri, target: "_blank"
+            %div
+              Metadata properties listed in the following are picked from #{mod_link}.
+            %div
+              This ontology repository implements #{mod_link} but does not necessity encode a metadata with the same properties (#{submission_link})
+          %div{style:"margin-bottom:400px"}
+            - @fair_scores_data[:criteria][:labels].each_with_index  do |label , index|
+              %div.my-3.border{id:get_name_with_out_dot(label)}
+                %div.py-3.px-4
+                  %h5.criterion-score-container
+                    %div
+                      = label +': '+ @fair_scores_data[:criteria][:descriptions][index]
+                    %div.progress.criterion-score-progress-bar
+                      - if @fair_scores_data[:criteria][:normalizedScores][index] > 0
+                        %div.progress-bar.bg-obtained_color{style:"width:#{@fair_scores_data[:criteria][:normalizedScores][index]}%"}
+                          #{@fair_scores_data[:criteria][:scores][index]} (#{@fair_scores_data[:criteria][:normalizedScores][index].round()}%)
 
-                    - not_obtained_score = get_not_obtained_score(@fair_scores_data , index)
-                    - not_obtained_score_normalized = get_not_obtained_score_normalized(@fair_scores_data , index)
-                    - score_rest = get_rest_score(@fair_scores_data , index)
-                    - score_rest_normalized = get_rest_score_normalized(@fair_scores_data , index)
+                      - not_obtained_score = get_not_obtained_score(@fair_scores_data , index)
+                      - not_obtained_score_normalized = get_not_obtained_score_normalized(@fair_scores_data , index)
+                      - score_rest = get_rest_score(@fair_scores_data , index)
+                      - score_rest_normalized = get_rest_score_normalized(@fair_scores_data , index)
 
 
-                    -if not_obtained_score_normalized > 0
-                      %div.progress-bar.bg-not-obtained_color{style:"width:#{not_obtained_score_normalized}%"}
-                        #{not_obtained_score} (#{not_obtained_score_normalized}%)
-                    - if score_rest_normalized > 0
-                      %div.progress-bar.bg-non-applicable_color{style:"width:#{score_rest_normalized}%"}
-                        #{score_rest} (#{score_rest_normalized}%)
-              %div.card-body
-                - @fair_scores_data[:criteria][:questions][index].each do |question|
-                  %div.card.m-3{id:get_name_with_out_dot(question[0])}
-                    %div.card-body
-                      %div.card-title.d-flex.justify-content-between
-                        %h6.mr-2
-                          #{question[0]} : #{question[1]["question"]}
+                      -if not_obtained_score_normalized > 0
+                        %div.progress-bar.bg-not-obtained_color{style:"width:#{not_obtained_score_normalized}%"}
+                          #{not_obtained_score} (#{not_obtained_score_normalized}%)
+                      - if score_rest_normalized > 0
+                        %div.progress-bar.bg-non-applicable_color{style:"width:#{score_rest_normalized}%"}
+                          #{score_rest} (#{score_rest_normalized}%)
+                %div.card-body
+                  - @fair_scores_data[:criteria][:questions][index].each do |question|
+                    %div.card.m-3{id:get_name_with_out_dot(question[0])}
+                      %div.card-body
+                        %div.card-title.d-flex.justify-content-between
+                          %h6.mr-2
+                            #{question[0]} : #{question[1]["question"]}
+                          %div
+                            %div.btn.text-white{class:"#{(
+                                               if question[1]["score"] > 0
+                                                   'bg-obtained_color'
+                                               elsif not_implemented?(question[1])
+                                                  'bg-non-applicable_color'
+                                               else
+                                                  'bg-not-obtained_color'
+                                               end
+                                               )}"}
+                              %span.badge.badge-pill.badge-light
+                                #{ print_score(question[1]["score"])} / #{print_score(question[1]["maxCredits"])}
+                        %div.mb-3
+                          -if not_implemented?(question[1])
+                            %span.badge.badge-pill.badge-danger{style:"white-space:normal;font-size:14px"}
+                              #{question[1]["explanation"]}
+                          -elsif default_score?(question[1])
+                            %span.badge.badge-pill.badge-success{style:"white-space:normal;font-size:14px"}
+                              #{question[1]["explanation"]}
                         %div
-                          %div.btn.text-white{class:"#{(
-                                             if question[1]["score"] > 0
-                                                 'bg-obtained_color'
-                                             elsif not_implemented?(question[1])
-                                                'bg-non-applicable_color'
-                                             else
-                                                'bg-not-obtained_color'
-                                             end
-                                             )}"}
-                            %span.badge.badge-pill.badge-light
-                              #{ print_score(question[1]["score"])} / #{print_score(question[1]["maxCredits"])}
-                      %div.mb-3
-                        -if not_implemented?(question[1])
-                          %span.badge.badge-pill.badge-danger{style:"white-space:normal;font-size:14px"}
-                            #{question[1]["explanation"]}
-                        -elsif default_score?(question[1])
-                          %span.badge.badge-pill.badge-success{style:"white-space:normal;font-size:14px"}
-                            #{question[1]["explanation"]}
-                      %div
-                        -if !not_implemented?(question[1]) && !default_score?(question[1])
-                          -if question[1]["points"]
-                            %button.btn.btn-outline-primary{'data-toggle':"collapse" ,'data-target':"#collapse-credits-"+get_name_with_out_dot(question[0])}
-                              See possible credits
+                          -if !not_implemented?(question[1]) && !default_score?(question[1])
+                            -if question[1]["points"]
+                              %button.btn.btn-outline-primary{'data-toggle':"collapse" ,'data-target':"#collapse-credits-"+get_name_with_out_dot(question[0])}
+                                See possible credits
+                            -if question[1]["properties"]
+                              %button.btn.btn-outline-primary{'data-toggle':"collapse" ,'data-target':"#collapse-properties-"+get_name_with_out_dot(question[0])}
+                                See metadata used properties
+                        %div.mt-2
+                          %div.collapse{id:"collapse-credits-"+get_name_with_out_dot(question[0])}
+                            %div.card.p-3
+                              - question[1]["points"].each do |point|
+                                %ul.list-group.list-group-flush
+                                  %li.list-group-item.d-flex.justify-content-between.align-items-center
+                                    %div.mr-2
+                                      = point["explanation"]
+                                    %span.badge.badge-pill.badge-primary
+                                      = point["score"]
                           -if question[1]["properties"]
-                            %button.btn.btn-outline-primary{'data-toggle':"collapse" ,'data-target':"#collapse-properties-"+get_name_with_out_dot(question[0])}
-                              See metadata used properties
-                      %div.mt-2
-                        %div.collapse{id:"collapse-credits-"+get_name_with_out_dot(question[0])}
-                          %div.card.p-3
-                            - question[1]["points"].each do |point|
-                              %ul.list-group.list-group-flush
-                                %li.list-group-item.d-flex.justify-content-between.align-items-center
-                                  %div.mr-2
-                                    = point["explanation"]
-                                  %span.badge.badge-pill.badge-primary
-                                    = point["score"]
-                        -if question[1]["properties"]
-                          %div.collapse{id:"collapse-properties-"+get_name_with_out_dot(question[0])}
-                            %div.card.p-3{style:"font-size:18px"}
-                              %div.d-flex.flex-wrap
-                                - question[1]["properties"].each do |key, value|
-                                  %div.badge.my-2.mx-1{class:(['', 'null', '[]',nil].include?(value) ? "badge-danger" : "badge-success") ,style:"white-space:normal"}
-                                    %span
-                                      = key
-                                    %span.badge.badge-light{style:"white-space:normal"}
-                                      - if value == nil
-                                        not found
-                                      -elsif value == "" || value == "[]"
-                                        null
-                                      - else
-                                        #{value}
+                            %div.collapse{id:"collapse-properties-"+get_name_with_out_dot(question[0])}
+                              %div.card.p-3{style:"font-size:18px"}
+                                %div.d-flex.flex-wrap
+                                  - question[1]["properties"].each do |key, value|
+                                    %div.badge.my-2.mx-1{class:(['', 'null', '[]',nil].include?(value) ? "badge-danger" : "badge-success") ,style:"white-space:normal"}
+                                      %span
+                                        = key
+                                      %span.badge.badge-light{style:"white-space:normal"}
+                                        - if value == nil
+                                          not found
+                                        -elsif value == "" || value == "[]"
+                                          null
+                                        - else
+                                          #{value}
 
 
 
diff --git a/app/views/home/feedback.html.haml b/app/views/home/feedback.html.haml
deleted file mode 100644
index b27dacddee..0000000000
--- a/app/views/home/feedback.html.haml
+++ /dev/null
@@ -1,59 +0,0 @@
-- @title = "Feedback"
-- if params[:pop].eql?("true")
-  - pop = true
-%div{:style => "margin:20px;"}
-  = form_tag('/feedback') do
-    -# Simulate form_for by providing a hidden field to check for submission
-    = hidden_field_tag 'sim_submit', 'true'
-    %p{:style => "font-size:14px"}
-      Support is available for Questions, Error reports, Feature requests, Ontology
-      submissions, etc.
-    %p
-      Please include the following:
-    .feedback
-      %ul
-        %li Your email, so we can respond.
-        %li
-          If you are describing an error, details of how the error occurred, including:
-          %ul
-            %li URL of the page resulting in the error
-            %li Exact steps to replicate the error
-            %li Full error message, if any
-    %p
-      You can use the form below or email us at
-      %a{:href => "mailto:#{$SUPPORT_EMAIL}"}= $SUPPORT_EMAIL
-    - unless @errors.nil?
-      %div{:style => "color:red;margin-bottom:1em;"}
-        Errors On Form
-        %ul
-          - for error in @errors
-            %li= error
-    %table.form
-      = hidden_field_tag("pop", pop)
-      = hidden_field_tag("location", params[:location])
-      - if session[:user].nil?
-        %tr
-          %th.top Name:*
-          %td.top
-            %input{:name => "name", :style => "width:180px", :type => "text", :value => "#{h(params[:name])}"}/
-        %tr
-          %th Email Address:*
-          %td
-            %input{:name => "email", :style => "width:180px", :type => "text", :value => "#{h(params[:email])}"}/
-      - else
-        Hello
-        = succeed "," do
-          %b= session[:user].username
-        = hidden_field_tag "name", session[:user].username
-        = hidden_field_tag "email", session[:user].email
-      %tr
-        %th.top Comment:*
-        %td.top
-          %textarea{:cols => "60", :name => "comment", :rows => "8"}= h(params[:comment])
-      - if using_captcha? && !session[:user]
-        %tr
-          %th
-          %td= recaptcha_tags
-      %tr
-        %td{:align => "right", :colspan => "2"}
-          %input{:type => "submit", :value => "Send Feedback"}/
diff --git a/app/views/home/feedback/feedback.html.haml b/app/views/home/feedback/feedback.html.haml
new file mode 100644
index 0000000000..5180a4a4a0
--- /dev/null
+++ b/app/views/home/feedback/feedback.html.haml
@@ -0,0 +1,58 @@
+- if params[:pop].eql?("true")
+  - pop = true
+- unless @errors.nil?
+  %div{:style => "color:red;margin-bottom:1em;"}
+    Errors On Form
+    %ul
+      - for error in @errors
+        %li= error
+= form_tag('/feedback') do
+  -# Simulate form_for by providing a hidden field to check for submission
+  = hidden_field_tag 'sim_submit', 'true'
+  = hidden_field_tag("pop", pop)
+  .d-flex.justify-content-center.m-3
+    .feedback-form
+      .feedback-title-container
+        %h2.feedback-title
+          Leave your feedback
+        %hr#feedback-title-line/
+      - unless session[:user].nil?
+        %p.feedback-text
+          Hi
+          %font 
+            = session[:user].username
+            ,
+      %p.feedback-email
+        you can use the form below or email us directly at:
+        %a{:href => "mailto: #{$SUPPORT_EMAIL}"}= $SUPPORT_EMAIL
+      - if session[:user].nil?
+        %p.feedback-input-title
+          Email
+          %font{:color => "red"} *
+        %input.feedback-input{:name => "email", :type => "email"}/
+        %p.feedback-input-title
+          Name
+          %font.register-optional (optional)
+        %input.feedback-input{:name => "name", :type => "text"}/
+      - else
+        = hidden_field_tag "name", session[:user].username
+        = hidden_field_tag "email", session[:user].email
+      %p.feedback-input-title
+        Error/Proposition page URL
+        %font.register-optional (optional)
+      %input.feedback-input{:name => "location", :type => "text", :value => unescape(params[:location] || '')}
+      %p.feedback-input-title
+        Feedback
+        %font{:color => "red"} *
+      %textarea.feedback-input{:name => "comment", :rows => "6"}
+      %p.feedback-input-title
+        Tags
+        %font.register-optional (optional)
+      .feedback-checks
+        = render(ChipsComponent.new(name:"bug", value: "Bug"))
+        = render(ChipsComponent.new(name:"proposition", value: "Proposition"))
+        = render(ChipsComponent.new(name:"question", value: "Question"))
+        = render(ChipsComponent.new(name:"ontology_submissions_request", value: "Ontology submissions request"))
+      - if using_captcha?
+        = recaptcha_tags  
+      %input.feedback-button{:type => "submit", :value => "Send"}/
diff --git a/app/views/home/feedback/feedback_complete.html.haml b/app/views/home/feedback/feedback_complete.html.haml
new file mode 100644
index 0000000000..3d15a85e04
--- /dev/null
+++ b/app/views/home/feedback/feedback_complete.html.haml
@@ -0,0 +1 @@
+= render CardMessageComponent.new(title: "Feedback sent successfully",message: "Thank you for taking the time to share your feedback with us. Our support team will review your message and get back to you as soon as possible with a response. We value your opinion and appreciate your help in improving our services. Thank you for your support!", type:"success")
\ No newline at end of file
diff --git a/app/views/home/feedback_complete.html.erb b/app/views/home/feedback_complete.html.erb
deleted file mode 100644
index 51fac9ba97..0000000000
--- a/app/views/home/feedback_complete.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<p style="margin: 2em;"><h2>Thanks for your feedback</h2></p>
-<script type="text/javascript">
-  setTimeout(function(){window.close()}, 1000);
-</script>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 65d542d316..730a85af56 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -10,7 +10,7 @@
     <!-- Google Webmaster Tools verifications -->
   	<meta name="google-site-verification" content="IBxfKu6VbYH9atd5OLu2zXVD2ZRWi9SgMKTi8nvw3ks" />
   <% end %>
-
+	<meta name="turbo-cache-control" content="no-cache">
 	<%= csrf_meta_tag %>
 
 	<title><%if @title.nil?%><%=$ORG_SITE%><%else%><%="#{@title} | #{$ORG_SITE}"%><%end%></title>
diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml
index 6a73ac7188..709267865b 100644
--- a/app/views/layouts/_ontology_viewer.html.haml
+++ b/app/views/layouts/_ontology_viewer.html.haml
@@ -36,6 +36,20 @@
     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;
 
+    var nav_ont = function (link) {
+      const page = jQuery(link).attr("data-bp-ont-page");
+      const page_name = jQuery(link).attr("data-bp-ont-page-name");
+      History.pushState({p: page}, page_name + " | " + jQuery(document).data().bp.ont_viewer.org_site, "?p=" + page);
+    }
+
+    jQuery(document).ready(() => {
+      jQuery("#navbar-ontology a").on("click", function (e) {
+        e.preventDefault();
+        nav_ont(this)
+      });
+    })
+
+
 
   = render TurboModalComponent.new(id: 'application_modal')
 
@@ -67,8 +81,8 @@
                 Last uploaded:
                 = l(Date.parse(sub.creationDate), format: :monthfull_day_year)
         %div.ont-info-links
-          - unless (@ontology.summaryOnly || @ont_restricted || @submissions.empty?)
-            = link_to(@submissions.first.id + "/download?apikey=#{get_apikey}", "aria-label": "Download latest version", title: "Download latest version") do
+          - unless (@ontology.summaryOnly || @ont_restricted || @submission_latest.nil?)
+            = link_to(@submission_latest.id + "/download?apikey=#{get_apikey}", "aria-label": "Download latest version", title: "Download latest version") do
               %i.fas.fa-lg.fa-download{"aria-hidden": true}
           - if details_available
             - if $PURL_ENABLED
diff --git a/app/views/layouts/angular.html.erb b/app/views/layouts/angular.html.erb
index ad3bb6928f..61b977ad44 100644
--- a/app/views/layouts/angular.html.erb
+++ b/app/views/layouts/angular.html.erb
@@ -11,7 +11,7 @@
 <head>
   <!-- Angular doesn't work well in sub-directories, this provides a base path that everything is relative to (HTML and Angular alike) -->
   <base href="<%=@base_path%>">
-
+  <meta name="turbo-cache-control" content="no-cache">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/app/views/layouts/appliance.html.haml b/app/views/layouts/appliance.html.haml
index 16b9ec0d2d..aae2cc1d6c 100644
--- a/app/views/layouts/appliance.html.haml
+++ b/app/views/layouts/appliance.html.haml
@@ -2,6 +2,7 @@
 %html
   %head
     <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+    <meta name="turbo-cache-control" content="no-cache">
 
     %title= @title.nil? ? "#{$ORG_SITE}" : "#{@title} | #{$ORG_SITE}"
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f835d2afa1..5ff643c328 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,6 +2,7 @@
 <html>
 <head>
   <title>BioportalWebUi</title>
+  <meta name="turbo-cache-control" content="no-cache">
   <%= stylesheet_link_tag "application", :media => "all" %>
   <%= csrf_meta_tags %>
   <%= javascript_include_tag "application"%>
diff --git a/app/views/layouts/minimal.html.erb b/app/views/layouts/minimal.html.erb
index 7f7e72c33f..99fe124573 100644
--- a/app/views/layouts/minimal.html.erb
+++ b/app/views/layouts/minimal.html.erb
@@ -3,6 +3,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
+  <meta name="turbo-cache-control" content="no-cache">
   <meta name="google-site-verification" content="IBxfKu6VbYH9atd5OLu2zXVD2ZRWi9SgMKTi8nvw3ks" />
   <%= csrf_meta_tag %>
   <title><%if @title.nil?%><%=$ORG_SITE%><%else%><%="#{@title} | #{$ORG_SITE}"%><%end%></title>
diff --git a/app/views/layouts/popup.html.erb b/app/views/layouts/popup.html.erb
index ea0bd1f0e1..8a41e63558 100644
--- a/app/views/layouts/popup.html.erb
+++ b/app/views/layouts/popup.html.erb
@@ -4,6 +4,7 @@
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
   <meta name="google-site-verification" content="IBxfKu6VbYH9atd5OLu2zXVD2ZRWi9SgMKTi8nvw3ks" />
+  <meta name="turbo-cache-control" content="no-cache">
   <title><%if @title.nil?%><%=$ORG_SITE%><%else%><%="#{@title} | #{$ORG_SITE}"%><%end%></title>
   <link rel="shortcut icon" href="/fav.ico" type="image/x-icon" />
   <link href='//fonts.googleapis.com/css?family=Droid+Sans:400' rel='stylesheet' type='text/css'>
diff --git a/app/views/login/index.html.erb b/app/views/login/index.html.erb
deleted file mode 100644
index 08110c66a8..0000000000
--- a/app/views/login/index.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@title = "Login"%>
-
-<%= form_for(:user, :url => {:controller => 'login',:action=>'create'}) do |f| %>
-<%unless @errors.nil?%>
-<div style="color:red;">
-Errors On Form
-<ul>
-
-<%for error in @errors%>
-<li><%=error%></li>
-<%end%>
-
-</ul>
-</div>
-<%end%>
-<center>
-  <table class="form" width="400px" style="margin-top:30px">
-    <tr>
-      <th nowrap align="right" >Account Name:</th>
-      <td class="top"><%= text_field 'user', 'username', :size => 25 %></td>
-    </tr>
-    <tr>
-      <th nowrap align="right" >Password:</th>
-      <td><%= password_field 'user','password', :size => 25, :autocomplete => "off" %></td>
-    </tr>
-    <tr>
-      <td colspan="2" align="right"><%= submit_tag "Login"%></td>
-    </tr>
-  </table>
-  <span style="font-size:1.2em;">Not Registered Yet?  <%=link_to "Sign Up", new_user_path%></span><br><br>
-  <span style="font-size:1.2em;"><%=link_to "Lost Password", '/lost_pass'%></span><br><br>
-</center>
-
-<% end %>
\ No newline at end of file
diff --git a/app/views/login/index.html.haml b/app/views/login/index.html.haml
new file mode 100644
index 0000000000..fccc1d0d74
--- /dev/null
+++ b/app/views/login/index.html.haml
@@ -0,0 +1,20 @@
+- @title = "Login"
+= form_for(:user, :url => {:controller => 'login',:action=>'create'}) do |f|
+  - unless @errors.nil?
+    %div{:style => "color:red;"}
+      Errors On Form
+      %ul
+        - for error in @errors
+          %li= error
+  .d-flex.justify-content-center
+    .login-form
+      %p.login-input-title Username or Email
+      = text_field 'user', 'username', class: "login-input email-input", placeholder: "Enter your password"
+      %p.login-input-title Password
+      = password_field 'user','password', :autocomplete => "off", class: "login-input password-input", placeholder: "Enter your password"
+      %a.login-forgot-password{:href => "/lost_pass"}
+        %p Forgot password?
+      %input.login-button{"data-disable-with" => "Login", :name => "commit", :type => "submit", :value => "Login"}/
+      %p.dont-have-account
+        Don't have an account?
+        %a.text-decoration-none{:href => new_user_path} Register
diff --git a/app/views/login/lost_password.html.erb b/app/views/login/lost_password.html.erb
deleted file mode 100644
index dbbf4338eb..0000000000
--- a/app/views/login/lost_password.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<%= form_for(:user , :url=>{:controller=>'login',:action=>'send_pass'}) do%>
-
-<center>
-
-<table class="form" width="400px" style="margin: 4em 4em 1em;">
-	<tr>
-		<th>Email: <span class="asterik">*</span></th><td class="top"><%=text_field 'user', :email%></td>
-	</tr>
-  <tr>
-    <th>Account Name: <span class="asterik">*</span></th><td><%=text_field 'user', :account_name%></td>
-  </tr>
-	<tr>
-		<td colspan="2" align="right">
-      <%=submit_tag "Email Password Reset Instructions"%>
-    </td>
-	</tr>
-</table>
-<div class="asterik" style="margin-bottom: 2em;">* required</div>
-</center>
-
-
-<%end%>
\ No newline at end of file
diff --git a/app/views/login/lost_password.html.haml b/app/views/login/lost_password.html.haml
new file mode 100644
index 0000000000..953fb9121e
--- /dev/null
+++ b/app/views/login/lost_password.html.haml
@@ -0,0 +1,15 @@
+= form_for(:user , :url=>{:controller=>'login',:action=>'send_pass'}) do
+  .d-flex.justify-content-center.m-4
+    .lost-password-form
+      .d-flex.justify-content-between
+        %a{:href => "javascript:javascript:history.go(-1)"}
+          %img.lost-password-arrowback{:src => "#{asset_path("arrow-back.svg")}"}/
+        .lost-password-title-container
+          %h2.lost-password-title
+            Recover password
+          %hr#lost-password-title-line/
+        %div
+      %p.lost-password-description Enter the email associated with your account and we will send an email with instructions to reset your password
+      %p.lost-password-input-title Email
+      = text_field 'user', :email,class: "lost-password-input", placeholder: "Enter the email"
+      %input.lost-password-button{:type => "submit", :value => "Send instructions"}/
diff --git a/app/views/login/lost_password_success.html.haml b/app/views/login/lost_password_success.html.haml
new file mode 100644
index 0000000000..92d3057ec9
--- /dev/null
+++ b/app/views/login/lost_password_success.html.haml
@@ -0,0 +1 @@
+= render(CardMessageComponent.new(message: "A password reset email has been sent to your email, please follow the instructions in the email to reset your password.", button_text: "Back home", type:"success"))
diff --git a/app/views/notes/_list.html.haml b/app/views/notes/_list.html.haml
index 06d12e35bb..5f3604d6bd 100644
--- a/app/views/notes/_list.html.haml
+++ b/app/views/notes/_list.html.haml
@@ -1,82 +1,2 @@
-- require 'cgi'
-- # Check to see if we have notes, if not then try to get them
-- @note_link = "/ontologies/#{@ontology.acronym}/notes/"
-.notes_list_container
-  .add_comment{style: "float: left; margin-right: 1em;"}
-    - if session[:user].nil?
-      = link_to "Add comment",  login_index_path(redirect: request.url), class: "link_button", style: "font-size: .9em;"
-    - else
-      = link_to "Add comment", "javascript:void(0);", class: "add_comment btn btn-primary", style: "font-size: .9em;", data: { parent_id: "#{@concept.id}", parent_type: "class" }
-  .add_proposal{style: "float: left; margin-right: 1em;"}
-    - if session[:user].nil?
-      = link_to "Add proposal",  login_index_path(redirect: request.url), class: "link_button", style: "font-size: .9em"
-    - else
-      = link_to "Add proposal", "javascript:void(0);", class: "add_proposal btn btn-primary", style: "font-size: .9em;", data: { parent_id: "#{@concept.id}", parent_type: "class" }
-  .subscribe_to_notes{:style => "float: left;"}
-    = subscribe_button(@ontology.id)
-  .notes_delete{:style => "float: left; margin-left: 1em;"}
-    / TODO_REV: Enable notes deletion
-    / delete_button
-  %div.create_note_form{style: "display: none; clear: both; padding-top: 1em;"}
-
-  .concept_notes_table_container{:style => "clear: both; padding-top: 2em;"}
-    %table.zebra.notes_concept_list_table{:class => "concept_notes_list", :style => "width: 100%; clear: both;", :width => "100%"}
-      %thead
-        %tr
-          %th.notes_delete
-            Delete
-          %th
-            Subject
-          %th
-            Author
-          %th
-            Type
-          %th
-            Created
-      %tbody
-        - if @notes.nil? || @notes.empty?
-          %tr#concept_no_notes
-            %td No notes to display
-            %td
-            %td
-            %td
-        - else
-          - @notes.each do |note|
-            %tr{:class => "#{note.id}_tr", :id => "#{note.id}_tr"}
-              %td.notes_delete
-                - if note.deletable?(session[:user])
-                  / TODO_REV: Handle notes deletion
-                  / %input.delete_note_checkbox{"data-applies_to" => note.appliesTo['id'], "data-note_id" => note.id, :id => "delete_#{note.id}", :type => "checkbox"}/
-              %td
-                = link_to note.subject, "#{@note_link}#{CGI.escape(note.id)}", :id => "row_#{note.id}", :class => "concept_notes_list_link notes_list_link"
-                &nbsp;&nbsp;&nbsp;
-                %span{:id => "#{note.id}_row_archived", :style => "font-size: x-small; color: grey;"}
-                  - if note.archived
-                    archived
-              %td
-                = get_username(note.creator)
-              %td
-                = note.proposal ? get_note_type_text(note.proposal.type) : "Comment"
-              %td
-                = DateTime.parse(note.created).strftime("%Y-%m-%d")
-:javascript
-  jQuery(".ontologies.show").ready(function(){
-    setupNotesFacebox()
-    setupNotesFaceboxSizing();
-    bindAddCommentClick();
-    bindAddProposalClick();
-    bindProposalChange();
-    bindReplyClick();
-    bindReplyCancelClick();
-    bindReplySaveClick();
-
-    jQuery("a.subscribe_to_notes").live("click", function(){
-      subscribeToNotes(this);
-    });
-
-    jQuery("#hide_archived_ont").click(function(){
-      hideOrUnhideArchivedOntNotes();
-    });
-
-    wireOntTable(jQuery("#notes_concept_list_table"));
-  });
\ No newline at end of file
+= render partial: 'notes/notes',
+                locals: {notes_table_id: 'notes_concept_list_table',parent_id: @concept.id, parent_type: 'class'}
\ No newline at end of file
diff --git a/app/views/notes/_new_comment.html.haml b/app/views/notes/_new_comment.html.haml
new file mode 100644
index 0000000000..885115ebe0
--- /dev/null
+++ b/app/views/notes/_new_comment.html.haml
@@ -0,0 +1,14 @@
+= turbo_frame_tag "application_modal_content" do
+  = render_alerts_container
+  = form_with url: notes_path, method: 'post', data:{turbo: true, 'turbo-frame': '_top'} do
+    = hidden_field_tag 'parent', parent_id
+    = hidden_field_tag 'type', type
+    = hidden_field_tag 'creator', user_id
+    = hidden_field_tag 'ontology_id', ontology_id
+    .reply_box
+      %div.form-group
+        %input.form-control.comment_subject{placeholder: "Subject", type: "text", name: 'subject', required: true}
+      %div.form-group
+        %textarea.form-control.reply_body{cols: "1", name: "body", required: true, placeholder: "Comment", rows: "1", style: "height: 100px;", tabindex: "0"}
+
+      = submit_tag "Save" , class:'btn btn-success btn-block'
diff --git a/app/views/notes/_new_proposal.html.haml b/app/views/notes/_new_proposal.html.haml
new file mode 100644
index 0000000000..9a3abbd8c0
--- /dev/null
+++ b/app/views/notes/_new_proposal.html.haml
@@ -0,0 +1,53 @@
+= render TurboFrameComponent.new(id: 'application_modal_content') do
+  :javascript
+    function updateProposalForm(event){
+      let frame = document.getElementById('application_modal_content')
+      let type = event.target.value
+      frame.src = "#{notes_new_proposal_path}?parent_type=#{parent_type}&ontology_id=#{ontology_id}&parent_id=#{parent_id}&proposal_type="+type
+    }
+
+  = render_alerts_container
+  = form_with url: notes_path, method: 'post', data:{turbo: true} do
+    = hidden_field_tag 'parent', parent_id
+    = hidden_field_tag 'type', parent_type
+    = hidden_field_tag 'creator', user_id
+    = hidden_field_tag 'ontology_id', ontology_id
+    .form-group.d-flex.align-items-center
+      %label.w-25{for: 'proposal_type'}
+        Proposal type:
+      = select_tag 'proposal[type]', options_for_select(types, type), class: 'proposal_type form-control', id: 'proposal_type', onChange: 'updateProposalForm(event)'
+
+    - if type.eql?('ProposalChangeHierarchy')
+      .form-group
+        = text_field_tag 'proposal[reasonForChange]', '', placeholder: "Reason for change", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[newTarget]', '', placeholder: "New target", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[oldTarget]', '', placeholder: "Old target", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[newRelationshipType]', '', placeholder: "Relationship type", class: "form-control", required: true
+
+    - elsif type.eql?('ProposalChangeProperty')
+      .form-group
+        = text_field_tag 'proposal[reasonForChange]', '', placeholder: "Reason for change", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[propertyId]', '', placeholder: "Property id", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[newValue]', '', placeholder: "New value", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[oldValue]', '', placeholder: "Old value", class: "form-control", required: true
+    - else
+      .form-group
+        = text_field_tag 'proposal[reasonForChange]', '', placeholder: "Reason for change", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[classId]','', placeholder: "Class id", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[label]','', placeholder: "Label", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[synonym]','', placeholder: "Synonym", class: "form-control", required: true
+      .form-group
+        = text_area_tag 'proposal[definition]','', placeholder: "Definition", class: "form-control", required: true
+      .form-group
+        = text_field_tag 'proposal[parent]','', placeholder: "Parent", class: "form-control", required: true
+
+    = submit_tag "Save" , class:'btn btn-success btn-block'
\ No newline at end of file
diff --git a/app/views/notes/_note_line.html.haml b/app/views/notes/_note_line.html.haml
new file mode 100644
index 0000000000..77823dd579
--- /dev/null
+++ b/app/views/notes/_note_line.html.haml
@@ -0,0 +1,29 @@
+%tr{id: "#{note.id}_tr_#{parent_type}"}
+  %td
+    - if current_user_admin?
+      - alert_text = "Are you sure you want to delete the note <span style='color:red;font-weight:bold;'> ''" + (note.subject || '') + "''</span> created by  <span style='color:red;font-weight:bold;'>" + note.creator.split('/')[-1] + "</span>?<br/><b>This action CAN NOT be undone!!!</b>"
+      = button_to "Delete", notes_path(noteid: note.id, parent_type: parent_type), method: :delete, class:'btn btn-sm btn-link',  form: {data: { turbo: true, turbo_confirm: alert_text, turbo_frame: '_top'}}
+  %td
+    - note_link = "/ontologies/#{ontology_acronym}/notes/"
+    - note_link =  "#{note_link}?noteid=#{CGI.escape(note.id)}"
+    = link_to_modal note.subject || note_link , note_link, id:"row_#{note.id}",
+                                class: "ont_notes_list_link notes_list_link",
+                                data: { show_modal_title_value: ""}
+    &nbsp;&nbsp;&nbsp;
+    %span{:id => "#{note.id}_row_archived", :style => "font-size: x-small; color: grey;"}
+      - if note.archived
+        archived
+  %td.d-none
+    = note.subject
+  %td.d-none
+    = note.archived || "false"
+  %td
+    = note.creator.split('/')[-1]
+  %td
+    = note.proposal ? get_note_type_text(note.proposal.type) : "Comment"
+  - if parent_type.eql?('ontology')
+    %td
+      - if note.relatedClass && note.relatedClass.length > 0
+        %a{href: "/ontologies/#{ontology_acronym}?p=classes&conceptid=#{CGI.escape(note.relatedClass.first)}"}= note.relatedClass.first
+  %td
+    = 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
new file mode 100644
index 0000000000..d7a13e4a65
--- /dev/null
+++ b/app/views/notes/_notes.html.haml
@@ -0,0 +1,56 @@
+- colspan = 7
+- colspan = 8 if parent_type.eql?('ontology')
+.notes_list_container
+  %div.d-flex{style:"font-size: .9em;"}
+    .add_comment.mx-1
+      = add_comment_button(parent_id, parent_type)
+    .add_proposal.mx-1
+      = add_proposal_button(parent_id, parent_type)
+    .subscribe_to_notes.mx-1
+      = subscribe_button(@ontology.id)
+
+  %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"} Hide Archived
+
+  = render_alerts_container("notes_#{parent_type}_list_table_alerts")
+
+  .ont_notes_table_container
+    %table.zebra.notes_ont_list_table{:id => "#{notes_table_id}", :style => "width: 100%;", :width => "100%"}
+      %thead
+        %tr
+          %th
+            Delete
+          %th
+            Subject
+          %th.d-none
+            Subject Sort
+          %th.d-none
+            Archive Sort
+          %th
+            Author
+          %th
+            Type
+          - if parent_type.eql?('ontology')
+            %th
+              Class
+          %th
+            Created
+      %tbody{id: "#{parent_type}_notes_table_content"}
+        - if @notes.nil? || @notes.empty?
+          %tr#ont_no_notes
+            %td{colspan: colspan} No notes to display
+            - (colspan-1).times.each do
+              %td
+        - 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/notes/_ontology_list.html.haml b/app/views/notes/_ontology_list.html.haml
index a90a498089..d253c87aa5 100644
--- a/app/views/notes/_ontology_list.html.haml
+++ b/app/views/notes/_ontology_list.html.haml
@@ -1,105 +1,2 @@
-- require 'cgi'
-- # Check to see if we have notes, if not then try to get them
-- if @notes.nil? && @concept && @ontology
-  - @note_link = "/ontologies/#{@ontology.acronym}/notes/"
-
-.notes_list_container
-  .add_comment{style: "float: left; margin-right: 1em;"}
-    - if session[:user].nil?
-      = link_to "Add comment", login_index_path(redirect: request.url), class: "link_button", style: "font-size: .9em", data: { parent_id: "#{@ontology.id}", parent_type: "ontology" }
-    - else
-      = link_to "Add comment", "javascript:void(0);", class: "add_comment btn btn-primary", style: "font-size: .9em", data: { parent_id: "#{@ontology.id}", parent_type: "ontology" }
-  .add_proposal{style: "float: left; margin-right: 1em;"}
-    - if session[:user].nil?
-      = link_to "Add proposal", login_index_path(redirect: request.url), class: "link_button", style: "font-size: .9em", data: { parent_id: "#{@ontology.id}", parent_type: "ontology" }
-    - else
-      = link_to "Add proposal", "javascript:void(0);", class: "add_proposal link_button btn btn-primary", style: "font-size: .9em", data: { parent_id: "#{@ontology.id}", parent_type: "ontology" }
-  .subscribe_to_notes{:style => "float: left;"}
-    = subscribe_button(@ontology.id)
-  .notes_delete{:style => "float: left; margin-left: 1em;"}
-    // TODO: Enable notes deletion
-    / delete_button
-  %div.ont_notes_filter{style: "clear: both; padding-top: 10px; float: right;"}
-    Filter:
-    %input#hide_archived_ont{:checked => "true", :name => "hide_archived_ont", :type => "checkbox"}
-    %label{:for => "hide_archived_ont"} Hide Archived
-  %div.create_note_form{style: "display: none; clear: both;"}
-
-  .ont_notes_table_container{:style => "clear: both;"}
-    %table.zebra.notes_ont_list_table{:id => "ontology_notes_list", :style => "width: 100%; clear: both;", :width => "100%"}
-      %thead
-        %tr
-          %th.notes_delete
-            Delete
-          %th
-            Subject
-          %th
-            Subject Sort
-          %th
-            Archive Sort
-          %th
-            Author
-          %th
-            Type
-          %th
-            Class
-          %th
-            Created
-      %tbody
-        - if @notes.nil? || @notes.empty?
-          %tr#ont_no_notes
-            %td No notes to display
-            %td
-            %td
-            %td
-            %td
-            %td
-            %td
-            %td
-        - else
-          - @notes.each do |note|
-            %tr{:class => "#{note.id}_tr", :id => "#{note.id}_tr"}
-              %td.notes_delete
-                - if note.deletable?(session[:user])
-                  / TODO_REV: Handle notes deletion
-                  / %input.delete_note_checkbox{"data-applies_to" => note.appliesTo['id'], "data-note_id" => note.id, :id => "delete_#{note.id}", :type => "checkbox"}/
-              %td
-                = link_to note.subject, "#{@note_link}#{CGI.escape(note.id)}", :id => "row_#{note.id}", :class => "ont_notes_list_link notes_list_link"
-                &nbsp;&nbsp;&nbsp;
-                %span{:id => "#{note.id}_row_archived", :style => "font-size: x-small; color: grey;"}
-                  - if note.archived
-                    archived
-              %td
-                = note.subject
-              %td
-                = note.archived || "false"
-              %td
-                = note.creator.split('/')[-1]
-              %td
-                = note.proposal ? get_note_type_text(note.proposal.type) : "Comment"
-              %td
-                - if note.relatedClass && note.relatedClass.length > 0
-                  %a{href: "/ontologies/#{@ontology.acronym}?p=classes&conceptid=#{CGI.escape(note.relatedClass.first)}"}= note.relatedClass.first
-              %td
-                = DateTime.parse(note.created).strftime("%Y-%m-%d")
-:javascript
-  jQuery(".ontologies.show").ready(function(){
-    setupNotesFacebox()
-    setupNotesFaceboxSizing();
-    bindAddCommentClick();
-    bindAddProposalClick();
-    bindProposalChange();
-    bindReplyClick();
-    bindReplyCancelClick();
-    bindReplySaveClick();
-
-    jQuery("a.subscribe_to_notes").live("click", function(){
-      subscribeToNotes(this);
-    });
-
-    jQuery("#hide_archived_ont").click(function(){
-      hideOrUnhideArchivedOntNotes();
-    });
-
-    wireOntTable(jQuery("#ontology_notes_list"));
-  });
\ No newline at end of file
+= render partial: 'notes/notes',
+                locals: {notes_table_id: 'ontology_notes_list',parent_id: @ontology.id, parent_type: 'ontology'}
\ No newline at end of file
diff --git a/app/views/notes/_thread.html.haml b/app/views/notes/_thread.html.haml
index 86bef7ccf9..990d63b73c 100644
--- a/app/views/notes/_thread.html.haml
+++ b/app/views/notes/_thread.html.haml
@@ -1,5 +1,4 @@
 %div.note
-
   %div
     = @note_decorator.title
     = @note_decorator.status
@@ -11,15 +10,6 @@
 
   = @note_decorator.body_content
   = @note_decorator.proposal_content
+    
+  = render partial: 'notes/reply/list', locals: {note: @note}
 
-  %div.reply
-    %div.reply_meta
-      - if session[:user].nil?
-        = link_to "reply", login_index_path
-      - else
-        = @note_decorator.reply_link
-
-    - if @note.reply && !@note.reply.empty?
-      %div.discussion
-        %div.discussion_container
-          = recurse_replies(@note.reply).html_safe
diff --git a/app/views/notes/reply/_list.html.haml b/app/views/notes/reply/_list.html.haml
new file mode 100644
index 0000000000..43596bb3c1
--- /dev/null
+++ b/app/views/notes/reply/_list.html.haml
@@ -0,0 +1,9 @@
+.reply_meta
+  = add_reply_button(note.id)
+  .discussion
+    .discussion_container
+      = render TurboFrameComponent.new(id: "#{note.id}_new_reply")
+      = turbo_frame_tag "#{note.id}_thread_replay_container" do
+        - children = note&.reply || note&.children
+        - children&.each do |reply|
+          = render partial: 'notes/reply/reply', locals: {note: reply}
\ No newline at end of file
diff --git a/app/views/notes/reply/_reply.html.haml b/app/views/notes/reply/_reply.html.haml
new file mode 100644
index 0000000000..bfcb875698
--- /dev/null
+++ b/app/views/notes/reply/_reply.html.haml
@@ -0,0 +1,11 @@
+.reply.mt-3.pl-4
+  = render_alerts_container("#{note.id}_reply")
+  - note_decorator = NoteDecorator.new(note, self)
+  .reply_author
+    %b #{note_decorator.author}
+    about #{note_decorator.created_date}
+  .reply_body
+    = note_decorator.body_content
+    %br/
+  = render partial: 'notes/reply/list', locals: {note: note}
+  %hr.w-100
\ No newline at end of file
diff --git a/app/views/notes/reply/new.html.haml b/app/views/notes/reply/new.html.haml
new file mode 100644
index 0000000000..898ca966b4
--- /dev/null
+++ b/app/views/notes/reply/new.html.haml
@@ -0,0 +1,9 @@
+= turbo_frame_tag frame_id do
+  = form_with url: notes_path, method: 'post', data:{turbo: true}, class: 'reply_box' do
+    = hidden_field_tag 'parent', parent_id
+    = hidden_field_tag 'type', type
+    = hidden_field_tag 'creator', user_id
+    %textarea.reply_body{cols: "1", name: "body", placeholder: "Comment", rows: "1", style: "width: 500px; height: 100px;", tabindex: "0", required: true}
+    %br/
+    %button.save.btn.btn-primary{style: "margin-right: 1em;", type: "submit"} save
+    %button.cancel.btn.btn-primary{onclick: "this.parentNode.remove()", type: "button"} cancel
\ No newline at end of file
diff --git a/app/views/notes/show.html.haml b/app/views/notes/show.html.haml
index 406756a582..30214eaace 100644
--- a/app/views/notes/show.html.haml
+++ b/app/views/notes/show.html.haml
@@ -1,4 +1,5 @@
-- ontology_name = @ontology ? " on #{@ontology.name}" : ""
-- @title = "Note#{ontology_name} | #{@note.subject}"
-#note_container{:style => "padding: 1em;"}
-  = render :partial => 'thread'
+= turbo_frame_tag 'application_modal_content' do
+  - ontology_name = @ontology ? " on #{@ontology.name}" : ""
+  - @title = "Note#{ontology_name} | #{@note.subject}"
+  #note_container{:style => "padding: 1em;"}
+    = render :partial => 'thread'
diff --git a/app/views/notifier/feedback.html.erb b/app/views/notifier/feedback.html.erb
deleted file mode 100644
index fccd243d27..0000000000
--- a/app/views/notifier/feedback.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
-  </head>
-  <body>
-    <p>
-      Name: <%=@name%>      
-    </p>
-    <p>
-      Email: <%=@email%>
-    </p>
-    <p>
-      Location: <%=@location%>
-    </p>
-    <p>
-      <br /><strong>Feedback:</strong>
-      <%=simple_format(@comment)%>
-    </p>
-  </body>
-</html>
diff --git a/app/views/notifier/feedback.html.haml b/app/views/notifier/feedback.html.haml
new file mode 100644
index 0000000000..aca3b2c6aa
--- /dev/null
+++ b/app/views/notifier/feedback.html.haml
@@ -0,0 +1,21 @@
+!!!
+%html
+  %head
+    %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %meta{content: "no-cache", name: "turbo-cache-control"}/
+  %body
+    %p
+      Name: #{@name}
+    %p
+      Email: #{@email}
+    %p
+      Location: #{@location}
+    %p Tags:
+    %ul
+      - for tag in @tags
+        %li
+          = tag
+    %p
+      %br/
+      %strong Feedback:
+      = simple_format(@comment)
\ No newline at end of file
diff --git a/app/views/ontologies/_fairs_score.html.haml b/app/views/ontologies/_fairs_score.html.haml
index 9fffa3f6b8..e3c29dd32f 100644
--- a/app/views/ontologies/_fairs_score.html.haml
+++ b/app/views/ontologies/_fairs_score.html.haml
@@ -1,17 +1,17 @@
 :javascript
-  jQuery(document).ready(function($) {
-    jQuery('a[rel*=facebox]').facebox()
+  jQuery(document).ready(function() {
     if(window.location.href.includes("#fair-details")){
       jQuery('#fair-details').click()
     }
   })
 
 - if @fair_scores_data
-  %a#fair-details.btn.btn-primary.w-100{href: "/ajax/fair_score/html/?ontologies=#{@ontology.acronym}" , rel:"facebox[.fair_score_details_pop]"}
-    %span
-      Total score : #{@fair_scores_data[:score]} ( #{@fair_scores_data[:normalizedScore]}% )
-    %span.badge.badge-light
-      details
+  - text = "<span>Total score : #{@fair_scores_data[:score]} ( #{@fair_scores_data[:normalizedScore]}% )</span> <span class='badge badge-light'>details</span>"
+  = link_to_modal(text.html_safe,
+                "/ajax/fair_score/html/?ontologies=#{@ontology.acronym}",
+                class: "btn btn-primary w-100",
+                data: { show_modal_title_value: "FAIRness assessment questions", show_modal_size_value: 'modal-xl' },
+                )
   %div.statistics_container
     %div
       = render partial: "shared/fair_score_radar" , locals: {data: @fair_scores_data}
diff --git a/app/views/ontologies/_form.html.haml b/app/views/ontologies/_form.html.haml
index e26a145a75..fe945e9f65 100644
--- a/app/views/ontologies/_form.html.haml
+++ b/app/views/ontologies/_form.html.haml
@@ -107,16 +107,6 @@
         "ontology[acronym]": "Please enter an acronym",
       },
     });
-
-    $('.tooltip_link[title][title!=""]').tooltipster({
-      interactive: true,
-      position: "right",
-      contentAsHTML: true,
-      animation: 'fade',
-      delay: 200,
-      theme: 'tooltipster-light',
-      trigger: 'hover'
-    });
   });
 
 :css
diff --git a/app/views/ontologies/_submissions.html.haml b/app/views/ontologies/_submissions.html.haml
deleted file mode 100644
index 0a5c96ee6b..0000000000
--- a/app/views/ontologies/_submissions.html.haml
+++ /dev/null
@@ -1,87 +0,0 @@
-- return "" if @ontology.metadata_only?
-
-:javascript
-  jQuery("#version_toggle").click(function(event){
-    event.preventDefault();
-    jQuery("#ontology_versions tr.hidden_select").toggleClass("hidden_ont");
-  });
-
-  jQuery("#version_toggle").toggle(
-    function() {
-      jQuery(this).text("less...");
-    },
-    function() {
-      jQuery(this).text("more...");
-    }
-  );
-
-  $(document).ready(function() {
-
-    $('.tooltip_link[title][title!=""]').tooltipster({
-      interactive: true,
-      position: "right",
-      contentAsHTML: true,
-      animation: 'fade',
-      delay: 200,
-      theme: 'tooltipster-shadow',
-      trigger: 'hover'
-    });
-  })
-
-
-- more_colspan = 4
-- more_colspan = 3 if @ont_restricted
-
-%div.click_versions_collapse
-  %table#ontology_versions.table.table-sm.table-striped
-    %thead
-      %tr
-        %th.align-middle Version
-        %th
-          = generate_attribute_text("released", "Released")
-        %th
-          = generate_attribute_text("modificationDate", "Modified")
-        %th
-          = generate_attribute_text("creationDate", "Uploaded")
-        - unless @ont_restricted
-          %th.align-middle Downloads
-    - begin
-      - submission_ready = @ontology.explore.latest_submission({:include_status => 'ready'})
-      - submission_readyId = submission_ready.submissionId unless submission_ready.nil?
-      - rescue
-      - submission_readyId = -1
-    - @submissions.each_with_index do |sub, index|
-      - hidden_row_class = index >= 5 ? "hidden_ont hidden_select" : ""
-      %tr{class: "#{hidden_row_class}"}
-        %td
-          = raw status_link(sub, sub.submissionId==submission_readyId)
-        %td
-          = xmldatetime_to_date(sub.released) unless sub.released.nil?
-        %td
-          = xmldatetime_to_date(sub.modificationDate) unless sub.modificationDate.nil?
-        %td
-          = xmldatetime_to_date(sub.creationDate) unless sub.creationDate.nil?
-        - unless @ont_restricted
-          %td
-            = raw download_link(sub, @ontology)
-    - if @submissions.length >= 5
-      %tr
-        %td{colspan: more_colspan, class: "show_more_subs"}
-          %a#version_toggle{:href => ""} more...
-
-:javascript
-  jQuery(document).ready(() => {
-    jQuery("#version_toggle").click( (event) => {
-        event.preventDefault();
-        jQuery("#ontology_versions tr.hidden_select").toggleClass("hidden_ont")
-        const oldText = event.target.innerHTML
-        switch (oldText) {
-          case 'more...':
-            event.target.innerHTML = 'less...'
-            break
-          case 'less...':
-            event.target.innerHTML = 'more...'
-            break
-        }
-    })
-  })
\ No newline at end of file
diff --git a/app/views/ontologies/_views.html.haml b/app/views/ontologies/_views.html.haml
index 33627eeac4..08ce27a249 100644
--- a/app/views/ontologies/_views.html.haml
+++ b/app/views/ontologies/_views.html.haml
@@ -34,7 +34,7 @@
     %span{:style => "font-size: x-large; margin-right: 1.5em;"} Views
     - ont_id_esc = CGI.escape(@ontology.id)
     - if session[:user].nil?
-      %a{:href => "/login?redirect=#{URI.escape("/ontologies/new?ontology[viewOf]=#{ont_id_esc}", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}"} Create new view
+      %a{:href => "/login?redirect=#{escape("/ontologies/new?ontology[viewOf]=#{ont_id_esc}")}"} Create new view
     - else
       %a{:href => "/ontologies/new?ontology[viewOf]=#{ont_id_esc}"} Create new view
 
diff --git a/app/views/ontologies/sections/_metadata.html.haml b/app/views/ontologies/sections/_metadata.html.haml
index e5b32cb3a0..46c942e612 100644
--- a/app/views/ontologies/sections/_metadata.html.haml
+++ b/app/views/ontologies/sections/_metadata.html.haml
@@ -1,4 +1,4 @@
-= turbo_frame_tag 'summary' do
+= turbo_frame_tag 'summary', target:"_top" do
   %div.ont-metadata
     -# Details pane
     %section.ont-metadata-card.ont-details-card
@@ -49,6 +49,11 @@
               %tr
                 %td Groups
                 %td= groups.map {|g| groups_hash[g].name}.sort.join(", ")
+          - if @ontology.admin?(session[:user])
+            %tr
+              %td Pull URL
+              %td
+                = link_to @submission_latest.pullLocation, @submission_latest.pullLocation
           = raw additional_details
 
     = render partial: 'additional_metadata'
@@ -63,7 +68,8 @@
           - unless (@submission_latest.nil? || (@submission_latest.respond_to?(:status) && @submission_latest.status == 404))
             = link_to(edit_ontology_submission_path(@ontology.acronym, @submission_latest.submissionId), "aria-label": "Edit latest submission", title: "Edit latest submission") do
               %i.fas.fa-user-edit{"aria-hidden": "true", style: "margin-left: 0.5rem;"}
-      = render partial: "submissions"
+      = render TurboFrameComponent.new(id: 'ontology_submissions', src: ontology_submissions_path(@ontology.acronym))
+
 
     -# Views pane (don't show if the ontology is a view - we don't allow views of views).
     - unless @ontology.view?
@@ -73,7 +79,7 @@
           - ont_id_esc = CGI.escape(@ontology.id)
           -# TODO: I don't think we should have brackets in the URL parameters.
           - if session[:user].nil?
-            %a{href: "/login?redirect=#{URI.escape("/ontologies/new?ontology[viewOf]=#{ont_id_esc}", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}", "aria-label": "Create new view", title: "Create new view"}
+            %a{href: "/login?redirect=#{escape("/ontologies/new?ontology[viewOf]=#{ont_id_esc}")}", "aria-label": "Create new view", title: "Create new view"}
               %i.fas.fa-lg.fa-plus-circle{"aria-hidden": "true", style: "margin-left: 0.5rem;"}
           - else
             %a{href: "/ontologies/new?ontology[viewOf]=#{ont_id_esc}"}
diff --git a/app/views/ontologies_metadata_curator/_attribute_inline.html.haml b/app/views/ontologies_metadata_curator/_attribute_inline.html.haml
new file mode 100644
index 0000000000..a58abd501d
--- /dev/null
+++ b/app/views/ontologies_metadata_curator/_attribute_inline.html.haml
@@ -0,0 +1,27 @@
+%div
+  - if @errors
+    %div
+      = render AlertMessageComponent.new(id:acronym+'-'+attribute+'-error', type: 'danger') do
+        = @errors.map{|e| e[:error]}.join(',')
+%div
+  - if attribute == "contact"
+    = raw submission.contact.map {|c| [c["name"], c["email"]].join(", ") if c.member?(:name) && c.member?(:email)}.join("<br/>")
+  - elsif attribute == "naturalLanguage"
+    - lang_codes = []
+    - submission.send(attribute).each do |lang|
+      - if (lang.to_s.eql?("en") || lang.to_s.eql?("eng") || lang.to_s.eql?("http://lexvo.org/id/iso639-3/eng"))
+        - lang_codes << "gb"
+      - elsif lang.to_s.start_with?("http://lexvo.org")
+        - lang_codes << $LEXVO_TO_FLAG[lang]
+      - else
+        - lang_codes << lang
+    %ul{:class => "f32"}
+      - lang_codes.each do |lang_code|
+        %li{:class => "flag " + lang_code, :style => "margin-right: 0.5em;"}
+  - elsif attribute == "ontology"
+    = acronym
+  - else
+    - if submission.instance_values[attribute.to_s].class == String && submission.instance_values[attribute.to_s][0..3] == "http"
+      %a{:href=> ""+ submission.instance_values[attribute.to_s] +""}= submission.instance_values[attribute.to_s]
+    - else
+      = submission.instance_values[attribute.to_s]
\ No newline at end of file
diff --git a/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml b/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml
new file mode 100644
index 0000000000..b2fdeedcb6
--- /dev/null
+++ b/app/views/ontologies_metadata_curator/_attribute_inline_editable.html.haml
@@ -0,0 +1,24 @@
+- acronym = ontology.acronym
+- submission_id = submission.submissionId
+- id = attribute_input_frame_id(acronym, submission_id, attribute)
+= render TurboFrameComponent.new(id: id+'_form') do
+  = form_for :submission, url: ontology_submission_path(acronym, submission_id), html: { method: :put, multipart: true, data: {turbo: 'true', turbo_frame: id + '_form'}} do
+    = hidden_field object_name(acronym, submission_id), :ontology, value: acronym
+    = hidden_field object_name(acronym, submission_id), :id, value: submission_id
+    = hidden_field_tag :attribute, attribute
+    = render TurboFrameComponent.new(id: id) do
+      %div.d-flex.justify-content-between.align-items-center
+        %div.d-flex.justify-content-between
+          %div
+            - equivalents = equivalent_properties(attribute)
+            - equivalents.each do |attr|
+              %div.d-flex
+                - if equivalents.size > 1
+                  %span= "#{attr}: "
+                %div
+                  = render_submission_attribute_inline(attr.to_s, submission, acronym)
+
+
+          %div
+            %a.btn.btn-sm.btn-light{href: "ontologies_metadata_curator/#{ontology.acronym}/submissions/#{submission_id}?properties=#{attribute}&inline_save=true", data: {turbo: true}}
+              %i.far.fa-edit
diff --git a/app/views/ontologies_metadata_curator/_form_edit.html.haml b/app/views/ontologies_metadata_curator/_form_edit.html.haml
new file mode 100644
index 0000000000..24ed94da2e
--- /dev/null
+++ b/app/views/ontologies_metadata_curator/_form_edit.html.haml
@@ -0,0 +1,39 @@
+= turbo_frame_tag 'application_modal_content' do
+  :javascript
+    function saveSelectedTab(value){
+      const input = document.getElementById("active_ontology")
+      input.value = value
+    }
+
+    $('#ontologies-pills-tab a[data-toggle="pill"]').on('shown.bs.tab',  (e) => {
+      saveSelectedTab(e.target.innerHTML.trim())
+    })
+
+  %div
+    = render_alerts_container
+
+    = form_for :submission, url: "/ontologies_metadata_curator/update", html: {method: :put}, data: { turbo: true} do
+      = hidden_field_tag :active_ontology, ontology_submission_id_label(*@selected_ontologies.first), id: 'active_ontology'
+      = hidden_field_tag :all_metadata, @all_metadata
+      %div.d-flex.justify-content-between
+        %ul#ontologies-pills-tab.nav.nav-pills.mb-3
+          - @selected_ontologies.each_with_index do |value, index|
+            - onto, sub_i = value
+            %li.nav-item
+              %a.nav-link{id: "pills-"+onto+sub_i+"-tab", "data-toggle": "pill", href: "#pills-"+onto+sub_i, class: index.zero? ? 'active' : ''}
+                = ontology_submission_id_label(onto, sub_i)
+      %div#change_all_warning_container
+        = render AlertMessageComponent.new(id:'change_all_warning', type: 'warning') do
+          %strong Apply the change for all
+          will update the current displayed content to all the following submssions:
+          - @selected_ontologies.map{|x| ontology_submission_id_label(*x)}.each do |onto|
+            %span.badge.badge-primary
+              = onto
+      #pills-tabContent.tab-content
+        - @selected_ontologies.each_with_index  do |value, index|
+          - onto, sub_i = value
+          = hidden_field_tag  "selected_ontologies[]", ontology_submission_id_label(*value)
+          .tab-pane{id: "pills-"+ onto+sub_i, class: index.zero? ? 'active' : ''}
+            = render TurboFrameComponent.new(id: 'metadata_by_ontology', src: "ontologies_metadata_curator/#{onto}/submissions/#{sub_i}"+"?properties=#{@selected_metadata.join(',')}&form_id=metadata_by_ontology", loading:"lazy")
+
+      = submit_tag "Save", class: "btn btn-primary btn-block"
diff --git a/app/views/ontologies_metadata_curator/_metadata_tab.html.haml b/app/views/ontologies_metadata_curator/_metadata_tab.html.haml
new file mode 100644
index 0000000000..d0c2abf764
--- /dev/null
+++ b/app/views/ontologies_metadata_curator/_metadata_tab.html.haml
@@ -0,0 +1,23 @@
+%div.mt-5.d-flex
+  %div.mx-auto.w-75
+    = form_tag("/ontologies_metadata_curator/result", method: "post", data: { turbo: true, turbo_frame: 'selection_metadata_form'}) do
+      %div
+        %div.mx-1.pt-3
+          = render FormGroupComponent.new(label:' Ontologies', inline: false) do
+            = render :partial => "shared/ontology_picker", locals: {sel_text: '', selected_ontologies: @ontologies_ids}
+      %div.d-flex.align-items-center.mb-5
+        %div.mx-1{style: 'width: 65%'}
+          = render MetadataSelectorComponent.new(label: 'Metadata Properties', values: submission_editable_properties , selected:  @metadata_sel)
+        %div.mx-1.mt-3{style: 'width: 15%'}
+          = render SwitchInputComponent.new(id:"show_submissions", name: "show_submissions", label: "Include all submissions")
+        %div.mt-3.flex-shrink-0
+          %button{type: "submit", class: "btn btn-success"}
+            Get values
+        %div.mt-3.flex-shrink-0.flex-fill.d-flex.align-items-center
+          = turbo_frame_tag "edit_metadata_btn"
+
+= render TurboFrameComponent.new(id: 'selection_metadata_form') do
+  %div.alert.alert-light.text-center
+    select ontologies and the metadata properties
+
+
diff --git a/app/views/ontologies_metadata_curator/_metadata_table.html.haml b/app/views/ontologies_metadata_curator/_metadata_table.html.haml
new file mode 100644
index 0000000000..73850816db
--- /dev/null
+++ b/app/views/ontologies_metadata_curator/_metadata_table.html.haml
@@ -0,0 +1,25 @@
+= render TurboFrameComponent.new(id: 'selection_metadata_form') do
+  :javascript
+    function showEditForm(event) {
+      event.preventDefault()
+      document.getElementById('show_bulk_edit_from_btn').click()
+    }
+
+  = form_tag("/ontologies_metadata_curator/edit", id: "properties_result_form", method: "post", data: { turbo: true, turbo_frame: 'application_modal_content' }) do
+    = hidden_field_tag :all_metadata, @metadata_sel
+    = submit_to_modal("Edit metadata values" , id:"show_bulk_edit_from_btn", class: "d-none",
+      data: { show_modal_title_value: "Metadata curator editor", show_modal_size_value: 'modal-xl' })
+    %div.table-container.mx-3
+      %table.zebra
+        %thead
+          %tr
+            %th Ontologies
+            - @metadata_sel.each do |meta|
+              %th
+                %div
+                  = render SwitchInputComponent.new(id: meta, name: 'selected_metadata[]', value: meta) do
+                    %h6{style:'margin-top: 0.2rem'}=generate_attribute_label(meta, label_tag_sym: :span)
+
+        %tbody
+          - @submissions.each do |submission|
+            = render partial: 'metadata_table_row', locals: {submission: submission, attributes: @metadata_sel}
diff --git a/app/views/ontologies_metadata_curator/_metadata_table_row.html.haml b/app/views/ontologies_metadata_curator/_metadata_table_row.html.haml
new file mode 100644
index 0000000000..dd687bfbaa
--- /dev/null
+++ b/app/views/ontologies_metadata_curator/_metadata_table_row.html.haml
@@ -0,0 +1,10 @@
+- acronym = submission.ontology.acronym
+- id = ontology_submission_id_label(acronym, submission.submissionId)
+%tr{id: id+'_row'}
+  %th{scope:"row", style: 'width: 5%'}
+    %div
+      = render SwitchInputComponent.new(id: submission.id, name: 'selected_acronyms[]', value: id) do
+        %h6{style:'margin-top: 0.2rem'}=id
+  - attributes.each do |meta|
+    %td{style: "width: #{95 / attributes.size}%; vertical-align: top; word-break: break-word;"}
+      = render partial: 'attribute_inline_editable', locals: {attribute: meta, submission: submission, ontology: submission.ontology}
\ No newline at end of file
diff --git a/app/views/shared/_ontology_picker_advanced.html.erb b/app/views/shared/_ontology_picker_advanced.html.erb
index 0e0720e15c..dcaa32a46c 100644
--- a/app/views/shared/_ontology_picker_advanced.html.erb
+++ b/app/views/shared/_ontology_picker_advanced.html.erb
@@ -10,122 +10,7 @@ var ontSelectListPos = { top: 0, left: 0, width: 0 };
 var allSelected = false;
 var alignToDOMId = <%=(align_to_dom_id || @select_id).to_json.html_safe%>;
 
-jQuery(document).ready(function(){
-  ontSelectListPos.top = jQuery("#"+alignToDOMId).offset().top;
-  ontSelectListPos.left = jQuery("#"+alignToDOMId).offset().left;
-  ontSelectListPos.width = jQuery("#"+alignToDOMId).width();
-
-  // Watch for changes in the entry of the select list
-  jQuery("#<%=@select_id%>").change(function(e) {
-    ontLabelToAbbr();
-    syncFromList();
-  });
-
-  // Reset labels on page load and make sure checkbox is in sync
-  ontLabelToAbbr();
-  syncFromList();
-
-  // Hide the advanced select when focusing in the chosen select box
-  jQuery("#"+alignToDOMId).bind("focus", hideAdvancedSelect);
-
-  // Hide the advanced select when clicking anywhere except in advanced select
-  jQuery('html').click(function() {
-    hideAdvancedSelect();
-  });
-
-  // Hide advanced select when hitting escape
-  jQuery(document).keyup(function(e) {
-    if (e.keyCode == 27) { hideAdvancedSelect(); } // esc
-  });
-
-  // Wire advanced selection
-  jQuery('#ont_select_adv').click(function(event){
-    event.stopPropagation();
-    bp_popup_cleanup();
-  });
-
-  // Wire clear selections
-  jQuery("#ont_select_clear").click(clearAllSelections);
-
-  // Wire up the link to open dialog box
-  jQuery("#ont_select_adv_href").click(function() {
-    var ont_select = jQuery("#ont_select_adv");
-    var chzn_select = jQuery("#"+alignToDOMId);
-
-    ont_select.css("top", "50px");
-    ont_select.css("left", chzn_select.offset().left + chzn_select.width() - 1);
-    ont_select.css("width", jQuery(window).width() - (chzn_select.offset().left + chzn_select.width()) - 100 + "px");
-    ont_select.css("height", jQuery(window).height() - 80);
-
-    // Configure the chosen select list box to remove background, move z-index above the advanced select
-    chzn_select.css("z-index", "4000");
-    chzn_select.children("ul.chzn-choices").addClass("no_right_border");
-    chzn_select.children("ul.chzn-choices").css("background", "white");
-    // Chosen select list congig changes for IE
-    chzn_select.children("ul.chzn-choices").css("filter", "none");
-    jQuery("#<%=@select_id%>_chzn input").css("filter", "none");
-
-    jQuery("#<%=@select_id%>_container").css("box-shadow", "0 0 10px gray");
-
-
-    jQuery("#ont_list_container").height(ont_select.height() - 80);
-
-    jQuery("#ont_select_adv").show();
 
-    return false;
-  });
-
-  // Wire up close advanced select "X"
-  jQuery("#close_adv_select").click(function(){
-    hideAdvancedSelect();
-  });
-
-  // Wire up watcher for checkboxes for sync
-  jQuery(".ont_select_boxes_tr input:checkbox").click(function(){
-    syncFromCheckboxes();
-    if (allSelected = true) {
-      allSelected = false;
-      jQuery("#ont_select_all").attr("checked", false);
-    } else {
-      // Compare total checkboxes to checked to see if they're all checked
-      if (jQuery(".ont_select_boxes_tr input:checkbox").length == jQuery(".ont_select_boxes_tr input:checked").length) {
-        allSelected = true;
-        jQuery("#ont_select_all").attr("checked", true);
-      }
-    }
-  });
-
-  // Toggle all selected
-  jQuery("#ont_select_all").click(function(){
-    if (jQuery(this).attr("checked")) {
-      allSelected = true;
-    } else {
-      allSelected = false;
-    }
-    jQuery(".ont_select_boxes_tr input:checkbox").attr("checked", allSelected);
-    syncFromCheckboxes();
-    refreshOntList();
-  });
-
-  // Select ontologies that are visible in the filter list
-  jQuery("#ont_select_all_filtered").click(function(){
-    if (jQuery(this).attr("checked")) {
-      jQuery(".ont_select_boxes_tr input:checkbox:visible").attr("checked", true);
-    } else {
-      jQuery(".ont_select_boxes_tr input:checkbox:visible").attr("checked", false);
-    }
-    syncFromCheckboxes();
-    refreshOntList();
-  });
-
-  // Wire up group/category select
-  select_groups.init();
-  select_categories.init();
-
-  // Wire up show all filtered link
-  jQuery("#show_all_filtered_ontologies").bind("click", showAllFiltered);
-
-});
 
 var hideAdvancedSelect = function(){
   if (jQuery("#ont_select_adv").is(":visible")) {
@@ -310,10 +195,127 @@ function clearAllSelections() {
 
 
   //ondomready
-  jQuery(function () {
-    listFilter(jQuery("#advanced_filter_input"), jQuery("#ont_list"));
-  });
+    jQuery(document).ready(() => {
+        listFilter(jQuery("#advanced_filter_input"), jQuery("#ont_list"));
+    })
 }(jQuery));
+
+jQuery(document).ready(function(){
+    ontSelectListPos.top = jQuery("#"+alignToDOMId).offset().top;
+    ontSelectListPos.left = jQuery("#"+alignToDOMId).offset().left;
+    ontSelectListPos.width = jQuery("#"+alignToDOMId).width();
+
+    // Watch for changes in the entry of the select list
+    jQuery("#<%=@select_id%>").change(function(e) {
+        ontLabelToAbbr();
+        syncFromList();
+    });
+
+    // Reset labels on page load and make sure checkbox is in sync
+    ontLabelToAbbr();
+    syncFromList();
+
+    // Hide the advanced select when focusing in the chosen select box
+    jQuery("#"+alignToDOMId).bind("focus", hideAdvancedSelect);
+
+    // Hide the advanced select when clicking anywhere except in advanced select
+    jQuery('html').click(function() {
+        hideAdvancedSelect();
+    });
+
+    // Hide advanced select when hitting escape
+    jQuery(document).keyup(function(e) {
+        if (e.keyCode == 27) { hideAdvancedSelect(); } // esc
+    });
+
+    // Wire advanced selection
+    jQuery('#ont_select_adv').click(function(event){
+        event.stopPropagation();
+        bp_popup_cleanup();
+    });
+
+    // Wire clear selections
+    jQuery("#ont_select_clear").click(clearAllSelections);
+
+    // Wire up the link to open dialog box
+    jQuery("#ont_select_adv_href").click(function() {
+        var ont_select = jQuery("#ont_select_adv");
+        var chzn_select = jQuery("#"+alignToDOMId);
+
+        ont_select.css("top", "50px");
+        ont_select.css("left", chzn_select.offset().left + chzn_select.width() - 1);
+        ont_select.css("width", jQuery(window).width() - (chzn_select.offset().left + chzn_select.width()) - 100 + "px");
+        ont_select.css("height", jQuery(window).height() - 80);
+
+        // Configure the chosen select list box to remove background, move z-index above the advanced select
+        chzn_select.css("z-index", "4000");
+        chzn_select.children("ul.chzn-choices").addClass("no_right_border");
+        chzn_select.children("ul.chzn-choices").css("background", "white");
+        // Chosen select list congig changes for IE
+        chzn_select.children("ul.chzn-choices").css("filter", "none");
+        jQuery("#<%=@select_id%>_chzn input").css("filter", "none");
+
+        jQuery("#<%=@select_id%>_container").css("box-shadow", "0 0 10px gray");
+
+
+        jQuery("#ont_list_container").height(ont_select.height() - 80);
+
+        jQuery("#ont_select_adv").show();
+
+        return false;
+    });
+
+    // Wire up close advanced select "X"
+    jQuery("#close_adv_select").click(function(){
+        hideAdvancedSelect();
+    });
+
+    // Wire up watcher for checkboxes for sync
+    jQuery(".ont_select_boxes_tr input:checkbox").click(function(){
+        syncFromCheckboxes();
+        if (allSelected = true) {
+            allSelected = false;
+            jQuery("#ont_select_all").attr("checked", false);
+        } else {
+            // Compare total checkboxes to checked to see if they're all checked
+            if (jQuery(".ont_select_boxes_tr input:checkbox").length == jQuery(".ont_select_boxes_tr input:checked").length) {
+                allSelected = true;
+                jQuery("#ont_select_all").attr("checked", true);
+            }
+        }
+    });
+
+    // Toggle all selected
+    jQuery("#ont_select_all").click(function(){
+        if (jQuery(this).attr("checked")) {
+            allSelected = true;
+        } else {
+            allSelected = false;
+        }
+        jQuery(".ont_select_boxes_tr input:checkbox").attr("checked", allSelected);
+        syncFromCheckboxes();
+        refreshOntList();
+    });
+
+    // Select ontologies that are visible in the filter list
+    jQuery("#ont_select_all_filtered").click(function(){
+        if (jQuery(this).attr("checked")) {
+            jQuery(".ont_select_boxes_tr input:checkbox:visible").attr("checked", true);
+        } else {
+            jQuery(".ont_select_boxes_tr input:checkbox:visible").attr("checked", false);
+        }
+        syncFromCheckboxes();
+        refreshOntList();
+    });
+
+    // Wire up group/category select
+    select_groups.init();
+    select_categories.init();
+
+    // Wire up show all filtered link
+    jQuery("#show_all_filtered_ontologies").bind("click", showAllFiltered);
+
+});
 </script>
 
 <div id="ont_select_adv" style="overflow: visible; z-index: 100; display: none; text-align: left; border: thin solid gray; position: fixed; background: white; max-width: 550px; box-shadow: 0 0 10px gray;">
diff --git a/app/views/shared/ui-component/_loader.html.haml b/app/views/shared/ui-component/_loader.html.haml
deleted file mode 100644
index d52309bb38..0000000000
--- a/app/views/shared/ui-component/_loader.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-.d-flex.align-items-center.flex-column
-  .spinner-border{:role => "status"}
-    %span.sr-only Loading...
-  .spinner-text.my-2
-    Loading...
\ No newline at end of file
diff --git a/app/views/submissions/_form.html.haml b/app/views/submissions/_form.html.haml
index e9e2ceb8ec..c986573498 100644
--- a/app/views/submissions/_form.html.haml
+++ b/app/views/submissions/_form.html.haml
@@ -1,70 +1,19 @@
-
-
 :javascript
   $(document).ready(function() {
-    
-    // Properly display the information for 'File Location' based on radio button
-    if (jQuery("#submission_isRemote_0").is(":checked")) {
-      location_toggle("upload");
-    }
-    if (jQuery("#submission_isRemote_1").is(":checked")) {
-      location_toggle("remote");
-    }
-    
-    // Select default 'File Location' radio button
-    if (!jQuery("#submission_isRemote_0").is(":checked") && !jQuery("#submission_isRemote_1").is(":checked") && !jQuery("#submission_isRemote_2").is(":checked")) {
-      jQuery("#submission_isRemote_0").attr("checked", "checked")
-    }
-    // Handles showing/hiding options for a particular ontology format
-    jQuery("#submission_hasOntologyLanguage").change(ontologyFormatChange);
-    
-    // Check to see if owl is selected, show options if so
-    ontologyFormatChange();
     jQuery("#ontology_submission_form").validate();
   });
-  
-  // Show/hide location inputs
-  function location_toggle(input_div) {
-    jQuery('.hidden_field').hide();
-    jQuery('.hidden_field input').attr("disabled", true);
-    jQuery('#' + input_div + " input").removeAttr("disabled");
-    jQuery('#' + input_div).show();
-  }
 
-  function ontologyFormatChange(format){
-    var selected = jQuery("#submission_hasOntologyLanguage option:selected");
 
-    switch(selected.val()){
-      case 'OWL':
-        jQuery(".format_options").optionsOut("fast");
-        jQuery("#owl_options").optionsIn("fast");
-        break;
-      case 'SKOS':
-        jQuery(".format_options").optionsOut("fast");
-        jQuery("#skos_options").optionsIn("fast");
-        break;
-      case 'OBO':
-        jQuery(".format_options").optionsOut("fast");
-        jQuery("#obo_options").optionsIn("fast");
-        break;
-      case 'UMLS':
-        jQuery(".format_options").optionsOut("fast");
-        jQuery("#umls_options").optionsIn("fast");
-        break;
-      default:
-        jQuery(".format_options").optionsOut("fast");
+  function onMetadataChange(){
+    let frame = document.getElementById('metadata_by_ontology')
+    let properties = document.getElementById('search_metadata')
+    let required = document.getElementById('filter-required-only')
+    let selectedProperties = "all"
+    if(properties){
+       selectedProperties = Array.from(properties.selectedOptions).map(({ value }) => value).join(',')
     }
+    frame.src = "?properties=" + selectedProperties + "&required=" + required.checked + "&show_sections=true"
   }
-  
-  jQuery.fn.optionsIn = function(speed, easing, callback){
-    jQuery("#format_spacing").css("margin", "1em 0");
-    this.fadeIn(speed);
-  };
-
-  jQuery.fn.optionsOut = function(speed, easing, callback){
-    this.css("display", "none");
-    jQuery("#format_spacing").css("margin", "0");
-  };
 
 - unless @errors.nil?
   %div.form-group.row
@@ -72,8 +21,14 @@
       %strong Errors On Form
       %ul
         - for error in @errors
-          %li
-            = error          
+          - if error.is_a? Array
+            %ul
+              - error[1].each do |key, message|
+                %li
+                  = message
+          - else
+            %li
+              = error
 
 %div#editMetadataDiv
   %div{:style => "width: 50%;margin: 3em auto;"}
@@ -83,656 +38,25 @@
     %div{:style => "text-align: center;"}
       %span.asterik * fields are required
       %br
-      = extractable_metadatum_tooltip({ text: 'Metadata that can be extracted from the ontology' })
-
-= hidden_field :submission, :ontology, value: @ontology.id
-
-%div.card.mt-4
-  %div.card-header.bg-success General
-  %div.card-body
-    %div.card-text
-      -# Format
-      %div.form-group.row
-        %label.col-sm-4.col-form-label{for: "submission_hasOntologyLanguage"}
-          Format
-          %span.asterik *
-        %div.col-sm-8
-          - ont_formats = ["OBO", "OWL", "UMLS", "SKOS"].sort
-          - selected = @submission.hasOntologyLanguage ? @submission.hasOntologyLanguage : "OWL"
-          -# TODO: Add/remove aria-describedby attribute for SKOS help text display
-          = select "submission", "hasOntologyLanguage", options_for_select(ont_formats, selected), {required: true}, {class: "form-control"}
-          %small.form-text.text-muted#helpSkosFormat
-            SKOS vocabularies submitted to BioPortal must contain a minimum of one concept scheme and top concept assertion. |
-            Please refer to the NCBO wiki for a more <a href="https://www.bioontology.org/wiki/index.php/SKOSSupport", target="_blank">detailed explanation</a> |
-            with examples. |
-
-      %div.form-group.row
-        %div.col-sm-8.offset-sm-4
-          %a#collapseOWLOptions{href: "#owl-options", role: "button", data: {toggle: "collapse"}, aria: {expanded: "false", controls: "owl-options"}, |
-          class: "btn btn-outline-secondary btn-sm"} Show advanced OWL options |
-
-      -# Optional property overrides for OWL ontologies
-      %div#owl-options.collapse
-        %div.form-group.row
-          %div.col-sm-8.offset-sm-2
-            %label Customize default property settings
-
-        -# Preferred name
-        %div.form-group.row
-          %div.col-sm-8.offset-sm-2
-            %label{for: "submission_prefLabelProperty"} Preferred name
-            = text_field :submission, :prefLabelProperty, value: @submission.prefLabelProperty, class: "form-control form-control-sm", aria: {describedBy: "preferredNameHelpBlock"}
-            %small.form-text.text-muted#preferredNameHelpBlock 
-              Enter a property ID, or use the default setting: |
-              <a href="http://www.w3.org/2004/02/skos/core#prefLabel", target="_blank">http://www.w3.org/2004/02/skos/core#prefLabel</a>. |
-  
-        -# Synonym
-        %div.form-group.row
-          %div.col-sm-8.offset-sm-2
-            %label{for: "submission_synonymProperty"} Synonym
-            = text_field :submission, :synonymProperty, value: @submission.synonymProperty, class: "form-control form-control-sm", aria: {describedBy: "synonymHelpBlock"}
-            %small.form-text.text-muted#synonymHelpBlock
-              Enter a property ID, or leave blank to use the default setting: |
-              <a href="http://www.w3.org/2004/02/skos/core#altLabel", target="_blank">http://www.w3.org/2004/02/skos/core#altLabel</a>. |
-  
-        -# Definition
-        %div.form-group.row
-          %div.col-sm-8.offset-sm-2
-            %label{for: "submission_definitionProperty"} Definition
-            = text_field :submission, :definitionProperty, value: @submission.definitionProperty, class: "form-control form-control-sm", aria: {describedBy: "definitionHelpBlock"}
-            %small.form-text.text-muted#definitionHelpBlock
-              Enter a property ID, or leave blank to use the default setting: |
-              <a href="http://www.w3.org/2004/02/skos/core#definition", target: "_blank">http://www.w3.org/2004/02/skos/core#definition</a>. |
-
-        -# Author
-        %div.form-group.row
-          %div.col-sm-8.offset-sm-2
-            %label{for: "submission_authorProperty"} Author
-            = text_field :submission, :authorProperty, value: @submission.authorProperty, class: "form-control form-control-sm", aria: {describedBy: "authorHelpBlock"}
-            %small.form-text.text-muted#authorHelpBlock
-              Enter a property ID, or leave blank to use the default setting: |
-              <a href="http://purl.org/dc/elements/1.1/creator", target: "_blank">http://purl.org/dc/elements/1.1/creator</a>. |
-
-        -# Obsolete classes
-        %div.form-group.row
-          %div.col-sm-8.offset-sm-2
-            %label Identify obsolete classes
-
-        %div.form-group.row 
-          %div.col-sm-8.offset-sm-2
-            %label{for: "submission_obsoleteProperty"} Obsolete property
-            = text_field :submission, :obsoleteProperty, value: @submission.obsoleteProperty, class: "form-control form-control-sm", aria: {describedBy: "obsoleteHelpBlock"}
-            %small.form-text.text-muted#obsoleteHelpBlock 
-              Optionally enter a property ID that indicates obsolete status for ontology classes |
-              (the property value must be set to "true"). Note that by default, BioPortal checks for existence of the owl:deprecated property. |
-
-        %div.form-group.row
-          %div.col-sm-8.offset-sm-2
-            %label{for: "submission_obsoleteParent"} Obsolete branch root
-            = text_field :submission, :obsoleteParent, value: @submission.obsoleteParent, class: "form-control form-control-sm", aria: {describedBy: "obsoleteRootHelpBlock"}
-            %small.form-text.text-muted#obsoleteRootHelpBlock 
-              Optionally enter a class ID for the root of an obsolete branch. All classes in the branch will be marked as |
-              obsolete, with the exception of the root class. |
-
-      -# Version
-      %div.form-group.row
-        %label.col-sm-4.col-form-label{for: "submission_version"} Version
-        %div.col-sm-8
-          = text_field :submission, :version, value: @submission.version, class: "form-control"
-
-      -# Status
-      %div.form-group.row
-        %label.col-sm-4.col-form-lable{for: "submission_status"} 
-          Status
-          %span.asterik *
-        %div.col-sm-8
-          - selected_status = @submission.status ? @submission.status : "alpha"
-          - status_options = ["alpha", "beta", "production", "retired"]
-          = select :submission, :status, status_options, {selected: selected_status, required: true}, class: "form-control"
-
-      -# Location
-      %div#submissionLocation.form-group.row
-        %label.col-sm-4.col-form-label.pt-0
-          Location
-          %span.asterik *
-        %div.col-sm-8
-          - if !@masterFileOptions
-            %div.form-check
-              - checked = @ontology.summaryOnly
-              = radio_button(:submission, :isRemote, 3, :onclick=>"$('.hidden_field').hide();", checked: checked, aria: {describedBy: "metadataHelpBlock"}, class: "form-check-input")
-              %label.form-check-label{for: "submission_isRemote_3"} 
-                Metadata only
-              %small.form-text.text-muted#metadataHelpBlock Allow users to view and search your ontology metadata, but not its classes and properties.
-            %div.form-check
-              - checked = !(@submission.pullLocation.nil? || @submission.pullLocation.empty?)
-              = radio_button(:submission, :isRemote, 1, :onclick=>"location_toggle('remote');", checked: checked, aria: {describedBy: "loadFromURLHelpBlock"}, class: "form-check-input")
-              %label.form-check-label{for: "submission_isRemote_1"} 
-                Load from URL
-              %small.form-text.text-muted#loadFromURLHelpBlock New versions loaded on a nightly basis.
-              - display = (checked and "" or "display:none;")
-              %div.hidden_field#remote{style: display}
-                = text_field(:submission, :pullLocation, value: @submission.pullLocation, aria: {describedBy: "enterURLHelpBlock"}, class: "form-control")
-                %small.form-text.text-muted#enterURLHelpBlock Enter a URL, including the name of your ontology source file, e.g., http://www.example.com/my_ontology.owl.
-            %div.form-check
-              - checked = (!@ontology.summaryOnly) && @submission.pullLocation.nil?
-              = radio_button(:submission, :isRemote, 0, :onclick=>"location_toggle('upload');", checked: checked, class: "form-check-input")
-              %label.form-check-label{for: "submission_isRemote_0"} 
-                Upload local file
-              - display = (checked and "" or "display:none;")
-              %div.hidden_field#upload{style: display}
-                = f.file_field(:filePath, class: "mt-2")
-          - else
-            -# TODO: Has this section of code actually been tested?
-            = radio_button :submission, :isRemote, 0, :onclick=>"location_toggle('upload');", checked: true
-            Upload Local File
-            %br/
-            %span{:style => "font-size:11px;"} (choose a file on your local file system to upload)
-            - display = (checked and "" or "display:none;")
-            %div#upload{style: display}
-              = f.file_field :filePath, required: true
-              = f.select("masterFileName", @masterFileOptions, { include_blank: "Select primary file from zip contents", required: true}, {style: "border-color: red;"})
-
-%div.card.mt-4
-  %div.card-header.bg-success Key properties
-  %div.card-body
-    %div.card-text
-      %div.form-group.row
-        %div.col-sm-4
-          -# generate_attribute functions are defined in submissions_helper.rb
-          = generate_attribute_label("URI")
-        %div.col-sm-8
-          = raw generate_attribute_input("URI")
-      %div.form-group.row
-        %div.col-sm-4
-          = generate_attribute_label("status")
-        %div.col-sm-8
-          - selected_status = @submission.status ? @submission.status : "alpha"
-          - status_options = ["alpha", "beta", "production", "retired"]
-          = select :submission, :status, status_options, { :selected => selected_status, :required => true}, {:class => "form-control"}
-      %div.form-group.row
-        %div.col-sm-4
-          = generate_attribute_label("deprecated")
-        %div.col-sm-8
-          = raw generate_attribute_input("deprecated")
-      %div.form-group.row
-        %div.col-sm-4
-          = generate_attribute_label("version")
-        %div.col-sm-8
-          = raw generate_attribute_input("version")
-      %div.form-group.row
-        %div.col-sm-4
-          = generate_attribute_label("hasOntologySyntax")
-        %div.col-sm-8
-          = generate_attribute_input("hasOntologySyntax")
-          %p
-            Properties taken from
-            = link_to "W3C URIs for file format", "https://www.w3.org/ns/formats/", target: "_blank"
-      %div.form-group.row
-        %div.col-sm-4
-          = generate_attribute_label("hasFormalityLevel")
-        %div.col-sm-8
-          = generate_attribute_input("hasFormalityLevel")
-          %p
-            Properties taken from
-            = link_to "DCMI KOS type vocabularies", "http://wiki.dublincore.org/index.php/NKOS_Vocabularies#KOS_Types_Vocabulary", target: "_blank"
-      %div.form-group.row
-        %div.col-sm-4
-          = generate_attribute_label("isOfType")
-        %div.col-sm-8
-          = generate_attribute_input("isOfType")
-      %div.form-group.row
-        %div.col-sm-4
-          = generate_attribute_label("naturalLanguage")
-        %div.col-sm-8
-          = generate_attribute_input("naturalLanguage")
-          %p
-            Consider using a
-            = link_to "Lexvo URI", "http://www.lexvo.org", target: "_blank"
-            with ISO639-3 code
-            %br
-            e.g.: http://lexvo.org/id/iso639-3/eng
-
-%div#description-card.card.mt-4
-  %div.card
-    %div.card-header.bg-success
-      %a.card-link{'data-toggle'=>'collapse', :href=>'#description'} Description
-    %div#description.show{'data-parent'=>"#description-card"}
-      %div.card-body
-        -# Description
-        %div.form-group.row
-          %label.col-sm-4.col-form-label{for: "submission_description"}
-            Description
-            %span.asterik *
-          %div.col-sm-8
-            = text_area :submission, :description, rows: 5, value: @submission.description, required: true, class: "form-control"
-        -# Home page
-        %div.form-group.row
-          %label.col-sm-4.col-form-label{for: "submission_homepage"} Homepage
-          %div.col-sm-8
-            = text_field :submission, :homepage, value: @submission.homepage, class: "form-control", aria: {describedBy: "homepageHelpBlock"}
-            %small.form-text.text-muted#homepageHelpBlock Enter a URL for the main page of your ontology.
-
-        -# Documentation page
-        %div.form-group.row
-          %label.col-sm-4.col-form-label{for: "submission_documentation"} Documentation
-          %div.col-sm-8
-            = text_field :submission, :documentation, value: @submission.documentation, class: "form-control", aria: {describedBy: "docsHelpBlock"}
-            %small.form-text.text-muted#docsHelpBlock Enter a URL for a page that provides ontology documentation.
-
-        -# Publications page
-        %div.form-group.row
-          %label.col-sm-4.col-form-label{for: "submission_publication"} Publications
-          %div.col-sm-8
-            = text_field :submission, :publication, value: @submission.publication, class: "form-control", aria: {describedBy: "pubsHelpBlock"}        
-            %small.form-text.text-muted#pubsHelpBlock Enter a URL for a page that lists publications about your ontology.
+      = extractable_metadatum_tooltip({ text: 'Metadata that can be extracted from the ontology' , content: "Extractable metadatum"})
 
-        -# Used ontology engineering tool
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("usedOntologyEngineeringTool")
-          %div.col-sm-8
-            = raw generate_attribute_input("usedOntologyEngineeringTool")
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-description-details'}  More description details
-    %div#more-description-details.collapse{'data-parent'=>"#description-card"}
-      %div.card-body
-        - for attr_name in ['abstract', 'notes', 'keywords', 'alternative', 'identifier']
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr_name)
-            %div.col-sm-8
-              = generate_attribute_input(attr_name)
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#define-usage'} Define usage
-    %div#define-usage.collapse{'data-parent'=>"#description-card"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'usage' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = generate_attribute_input(attr["attribute"])
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-methodology-information'} More methodology information
-    %div#more-methodology-information.collapse{'data-parent'=>"#description-card"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'methodology' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = generate_attribute_input(attr["attribute"])
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-links'} More links
-    %div#more-links.collapse{'data-parent'=>"#description-card"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'links' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = generate_attribute_input(attr["attribute"])
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#ontology-images'} Ontology images
-    %div#ontology-images.collapse{'data-parent'=>"#description-card"}
-      %div.card-body
-        -# More description details
-        - for attr in @metadata.select { |m| m['display'] == 'images' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = generate_attribute_input(attr["attribute"])
+  %div.d-flex.align-items-center.justify-content-between{onchange: "onMetadataChange()"}
+    - unless @filters_disabled
+      %div.w-75.mt-3
+        - if @submission.id
+          = render MetadataSelectorComponent.new(label: 'Filter properties to show', values: submission_editable_properties , selected:  nil, inline: true)
+      %div
+        = render SwitchInputComponent.new(id:"filter-required-only", name: "required-only", label: "Required only", checked: @required_only)
 
-%div#ontology-dates-card.mt-4
-  %div.card
-    %div.card-header.bg-success
-      %a.card-link{'data-toggle'=>'collapse', :href=>'#ontology-dates'} Dates
-    %div#ontology-dates.collapse.show{'data-parent'=>"#ontology-dates-card"}
-      %div.card-body
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label('released')
-          %div.col-sm-8
-            = raw generate_attribute_input('released', default: Date.today)
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label('modificationDate')
-          %div.col-sm-8
-            = raw generate_attribute_input('modificationDate')
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-dates'} More dates
-    %div#more-dates.collapse{'data-parent'=>"#ontology-dates-card"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'dates' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = raw generate_attribute_input(attr["attribute"])
 
-%div#licenses-card.card.mt-4
-  %div.card
-    %div.card-header.bg-success
-      %a.card-link{'data-toggle'=>'collapse', :href=>'#licenses'} Licenses
-    %div#licenses.collapse.show{'data-parent'=>"#licenses-card"}
-      %div.card-body
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("hasLicense")
-          %div.col-sm-8
-            = raw generate_attribute_input("hasLicense")
-        %div.form-group.row
-          %div.col-sm-12
-            %p
-              Consider using a
-              = link_to "URI to describe your License", "http://rdflicense.appspot.com", target: "_blank"
-            %p
-              Consider using
-              = link_to "INRIA licentia", "http://licentia.inria.fr/", target: "_blank"
-              to choose your license
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-licensing-info'}  More licensing information
-    %div#more-licensing-info.collapse{'data-parent'=>"#licenses"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'license' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = generate_attribute_input(attr["attribute"])
-
-%div#community.mt-4
-  %div.card
-    %div.card-header.bg-success
-      %a.card-link{'data-toggle'=>'collapse', :href=>'#contacts-panel'} Contacts
-    %div#contacts-panel.collapse.show{'data-parent'=>"#community"}
-      %div.card-body
-        -# Contact(s)
-        %div#contacts.form-group.row
-          %label.col-sm-4.col-form-label
-            Contact
-            %span.asterik *
-          - if @submission.contact && @submission.contact.size > 0
-            - @submission.contact.each_with_index do |contact, i|
-              - if i == 0
-                -# Contact div
-                %div.col-sm-8.d-flex.align-items-center.contact
-                  %label Name
-                  = text_field :submission, :"contact[#{i}][name]", value: contact["name"], class: "form-control flex-grow-1 mx-2"
-                  %label Email
-                  = text_field :submission, :"contact[#{i}][email]", value: contact["email"], class: "form-control flex-grow-1 mx-2"
-                  %button.btn.btn-success.add-contact
-                    %i{class: "fas fa-plus fa-lg", aria: {hidden: "true"}}
-              - else
-                -# TODO
-                -# Secondary contacts need to be offset by 2 columns, and have a delete button.
-                %div.col-sm-8.d-flex.align-items-center.offset-sm-2.contact
-                  %label Name
-                  = text_field :submission, :"contact[#{i}][name]", value: contact["name"], class: "form-control flex-grow-1 mx-2"
-                  %label Email
-                  = text_field :submission, :"contact[#{i}][email]", value: contact["email"], class: "form-control flex-grow-1 mx-2"
-                  %button.btn.btn-success.add-contact
-                    %i{class: "fas fa-plus fa-lg", aria: {hidden: "true"}}
-                  %button.btn.btn-danger.ml-1.remove-contact
-                    %i{class: "fas fa-minus fa-lg", aria: {hidden: "true"}}
-          - else
-            -# TODO
-            %div.col-sm-8.d-flex.align-items-center.contact
-              %label Name:
-              = text_field :submission, :"contact[0][name]", class: "form-control flex-grow-1 mx-2"
-              %label Email:
-              = text_field :submission, :"contact[0][email]", class: "form-control flex-grow-1 mx-2"
-              %button.btn.btn-success.add-contact
-                %i{class: "fas fa-plus fa-lg", aria: {hidden: "true"}}
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("hasContributor")
-          %div.col-sm-8
-            = raw generate_attribute_input("hasContributor")
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("hasCreator")
-          %div.col-sm-8
-            = raw generate_attribute_input("hasCreator")
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-community-info'}  More community information
-    %div#more-community-info.collapse{'data-parent'=>"#community"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'community' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = raw generate_attribute_input(attr["attribute"])
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-people-info'}  More people information
-    %div#more-people-info.collapse{'data-parent'=>"#community"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'people' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = raw generate_attribute_input(attr["attribute"])
-
-%div#ontology-relations-more.mt-4
-  %div.card
-    %div.card-header.bg-success
-      %a.card-link{'data-toggle'=>'collapse', :href=>'#ontology-relations'} Ontology relations
-    %div#ontology-relations.collapse.show{'data-parent'=>"#ontology-relations-more"}
-      %div.card-body
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("useImports")
-          %div.col-sm-8
-            = raw generate_attribute_input("useImports")
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("hasPriorVersion")
-          %div.col-sm-8
-            = raw generate_attribute_input("hasPriorVersion")
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("isAlignedTo")
-          %div.col-sm-8
-            = raw generate_attribute_input("isAlignedTo")
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("ontologyRelatedTo")
-          %div.col-sm-8
-            = raw generate_attribute_input("ontologyRelatedTo")
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-relations'}  More relations
-    %div#more-relations.collapse{'data-parent'=>"#ontology-relations-more"}
-      %div.card-body
-        - for attr in @metadata
-          - if attr["display"].eql?("relations")
-            %div.form-group.row
-              %div.col-sm-4
-                = generate_attribute_label(attr["attribute"])
-              %div.col-sm-8
-                = raw generate_attribute_input(attr["attribute"])
-
-%div#ontology-content-metrics.mt-4
-  %div.card
-    %div.card-header.bg-success
-      %a.card-link{'data-toggle'=>'collapse', :href=>'#ontology-content'} Ontology content
-    %div#ontology-content.collapse.show{'data-parent'=>"#ontology-content-metrics"}
-      %div.card-body
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("preferredNamespacePrefix")
-          %div.col-sm-8
-            = raw generate_attribute_input("preferredNamespacePrefix")
-        %div.form-group.row
-          %div.col-sm-4
-            = generate_attribute_label("preferredNamespaceUri")
-          %div.col-sm-8
-            = raw generate_attribute_input("preferredNamespaceUri")
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-informations'}  More content informations
-    %div#more-informations.collapse{'data-parent'=>"#ontology-content-metrics"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'content' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = raw generate_attribute_input(attr["attribute"])
-  %div.card
-    %div.card-header
-      %a.card-link.collapsed{'data-toggle'=>'collapse', :href=>'#more-metrics-informations'}  More metrics informations
-    %div#more-metrics-informations.collapse{'data-parent'=>"#ontology-content-metrics"}
-      %div.card-body
-        - for attr in @metadata.select { |m| m['display'] == 'metrics' }
-          %div.form-group.row
-            %div.col-sm-4
-              = generate_attribute_label(attr["attribute"])
-            %div.col-sm-8
-              = raw generate_attribute_input(attr["attribute"])
+= render partial: 'form_content', locals: {id: 'metadata_by_ontology', acronym: @ontology.acronym, submissionId: @submission.submissionId}
 
 %div.form-group.row
   %div.col-12.text-center
-    %label.col-form-label.font-italic.asterik * Fields marked with an asterisk are required.  
+    %label.col-form-label.font-italic.asterik * Fields marked with an asterisk are required.
 
 %div.form-group.row
   %div.col-6
     = submit_tag button_text, class: "btn btn-primary"
   %div.col-6.text-right
     = link_to "Cancel", :back, class: "btn btn-warning"
-
-:javascript
-
-  $(document).ready(function() {
-
-    /**
-     * For Multiple select
-     */
-    "use strict";
-    jQuery("#naturalLanguageSelect").chosen({
-      search_contains: true
-    });
-    jQuery(".selectOntology").chosen({
-      width: '100%',
-      search_contains: true
-    });
-    $('.tooltip_link[title][title!=""]').tooltipster({
-      interactive: true,
-      position: "right",
-      contentAsHTML: true,
-      animation: 'fade',
-      delay: 200,
-      theme: 'tooltipster-shadow',
-      trigger: 'hover'
-    });
-  })
-
-  /**
-   * To add a new input when btn clicked. Using the given attribute to get elements id
-   */
-  function addInput(attr, inputType)
-  {
-    var container = document.createElement("div");
-    container.innerHTML = '<input type="' + inputType + '" name="submission[' + attr + '][]" id="submission_' + attr + '" class="form-control">';
-    document.getElementById(attr + 'Div').appendChild(container);
-  }
-
-  /**
-   * To add a new value to selectDropdown when btn clicked
-   */
-  function addValueToSelect(attr)
-  {
-    if(jQuery('#add_' + attr).val()) {
-      var newOption = jQuery('#add_' + attr).val();
-      var selectedOptions = jQuery('#select_' + attr).val();
-      jQuery('#select_' + attr).append(jQuery('<option>', {
-        value: newOption,
-        text: newOption
-      }));
-      if (selectedOptions.constructor === Array) {
-        selectedOptions.push(newOption);
-      } else {
-        selectedOptions = newOption;
-      }
-      jQuery('#select_' + attr).val(selectedOptions)
-      jQuery('#add_' + attr).val("");
-      jQuery('#btnAdd' + attr).hide();
-      jQuery('#add_' + attr).hide();
-    }
-  }
-
-  /**
-   * To add a new value to selectDropdown when btn clicked
-   */
-  function addOntoToSelect(attr)
-  {
-    if(jQuery('#add_' + attr).val()) {
-      var newOption = jQuery('#add_' + attr).val();
-      var selectedOptions = jQuery('#select_' + attr).val();
-      jQuery('#select_' + attr).append(jQuery('<option>', {
-        value: newOption,
-        text: newOption
-      }));
-      if (selectedOptions === null) {
-        selectedOptions = [];
-        selectedOptions.push(newOption);
-      } else if (selectedOptions.constructor === Array) {
-        selectedOptions.push(newOption);
-      } else {
-        selectedOptions = newOption;
-      }
-      jQuery('#select_' + attr).val(selectedOptions)
-      jQuery('#select_' + attr).trigger("chosen:updated");
-      jQuery('#add_' + attr).val("");
-    }
-  }
-
-  /**
-   * To show/hide the simple metadata div
-   */
-  function toggleDiv(divId, panelGroup = "none")
-  {
-    var e = document.getElementById(divId + "Div");
-    if (e.style.display == 'block') {
-      e.style.display = 'none';
-      document.getElementById(divId + "Btn").classList.remove("active");
-    } else {
-      if (panelGroup === "description") {
-        // if panel chosen isPart of description, close the others
-        jQuery(".descriptionPanels").css("display", "none");
-        jQuery(".descriptionBtn").removeClass("active");
-      } else if (panelGroup === "commuple") {
-        jQuery(".commuplePanels").css("display", "none");
-        jQuery(".commupleBtn").removeClass("active");
-      } else if (panelGroup === "ontocontent") {
-        jQuery(".ontocontentPanels").css("display", "none");
-        jQuery(".ontocontentBtn").removeClass("active");
-      }
-
-      e.style.display = 'block';
-      document.getElementById(divId + "Btn").classList.add("active");
-    }
-  }
-
-  function toggleOtherValue(attr) {
-    if ($('#select_' + attr).val() == 'other') {
-      $('#add_' + attr).val("");
-      $('#btnAdd' + attr).show();
-      $('#add_' + attr).show();
-    } else {
-      $('#btnAdd' + attr).hide();
-      $('#add_' + attr).hide();
-    }
-  }
diff --git a/app/views/submissions/_form_content.html.haml b/app/views/submissions/_form_content.html.haml
new file mode 100644
index 0000000000..5b55e4ec99
--- /dev/null
+++ b/app/views/submissions/_form_content.html.haml
@@ -0,0 +1,146 @@
+= render TurboFrameComponent.new(id:id) do
+  = hidden_field object_name, :ontology, value: acronym
+  = hidden_field object_name, :id, value: submissionId
+  %div#general-card.mt-4
+    = metadata_section('general', 'General', collapsed: false) do
+      = attribute_container('format', required: true) do
+        = turbo_frame_tag  "#{object_name(acronym, submissionId)}Format_from_group_input" do
+          = render partial: 'submissions/submission_format_form'
+      = attribute_text_field_container('version')
+
+      = attribute_form_group_container('status', required: true) do |c|
+        - selected_status = c.value ? c.value : "alpha"
+        - status_options = %w[alpha beta production retired]
+        = select c.name,  c.method_name, status_options, {selected: selected_status, required: true}, class: "form-control"
+
+      = attribute_form_group_container('location', required: true) do
+        = render partial: 'submissions/submission_location_form'
+
+    %div#key-properties-card.mt-4
+      = metadata_section('key-properties', 'Key properties', collapsed: false) do
+        = form_group_attribute("URI")
+        = form_group_attribute("deprecated")
+        = form_group_attribute("hasOntologySyntax") do
+          %p
+            Properties taken from
+            = link_to "W3C URIs for file format", "https://www.w3.org/ns/formats/", target: "_blank"
+
+        = form_group_attribute("hasFormalityLevel") do
+          %p
+            Properties taken from
+            = link_to "DCMI KOS type vocabularies", "http://wiki.dublincore.org/index.php/NKOS_Vocabularies#KOS_Types_Vocabulary", target: "_blank"
+
+        = form_group_attribute("isOfType")
+        = form_group_attribute("naturalLanguage") do
+          %p
+            Consider using a
+            = link_to "Lexvo URI", "http://www.lexvo.org", target: "_blank"
+            with ISO639-3 code
+            %br
+            e.g.: http://lexvo.org/id/iso639-3/eng
+
+    %div#description-card.mt-4
+      = metadata_section('description', 'Description', collapsed: !@required_only || !@submission.id.nil?) do
+        -# Description
+        = attribute_form_group_container('description', required: true) do |c|
+          = text_area c.name, c.method_name, rows: 5, value: @submission.description, required: true, class: "form-control"
+
+        -# Home page
+        = attribute_text_field_container('homepage') do |c|
+          - c.help do
+            Enter a URL for the main page of your ontology.
+
+        -# Documentation page
+        = attribute_text_field_container('documentation') do |c|
+          - c.help do
+            Enter a URL for a page that provides ontology documentation.
+
+        -# Publications page
+        = attribute_text_field_container('publication') do |c|
+          - c.help do
+            Enter a URL for a page that lists publications about your ontology.
+
+        -# Used ontology engineering tool
+        = form_group_attribute("usedOntologyEngineeringTool")
+
+      = metadata_section('more-description-details', 'More description details', parent_id: "description-card") do
+        - for attr_name in %w[abstract notes keywords alternative identifier]
+          = form_group_attribute(attr_name)
+
+      - data = sections
+
+      - data.each do |d|
+        = metadata_section(d[0], d[1], parent_id: "description-card") do
+          - for attr in @metadata.select { |m| m['display'] == d[2] }
+            = form_group_attribute(attr["attribute"])
+
+    %div#ontology-dates-card.mt-4
+      = metadata_section('ontology-dates', 'Dates', collapsed: !@required_only  || !@submission.id.nil?) do
+        = form_group_attribute("released", default: Date.today, required: true)
+        = form_group_attribute("modificationDate")
+      = metadata_section('more-dates', 'More dates', parent_id: "ontology-dates-card") do
+        - for attr in @metadata.select { |m| m['display'] == 'dates' }
+          = form_group_attribute(attr["attribute"])
+
+    %div#licenses-card.mt-4
+      = metadata_section('licenses', 'Licenses') do
+        = form_group_attribute("hasLicense") do
+          %p
+            Consider using a
+            = link_to "URI to describe your License", "http://rdflicense.appspot.com", target: "_blank"
+          %p
+            Consider using
+            = link_to "INRIA licentia", "http://licentia.inria.fr/", target: "_blank"
+            to choose your license
+
+      = metadata_section('more-licensing-info', 'More licensing information', parent_id: "licenses-card") do
+        - for attr in @metadata.select { |m| m['display'] == 'license' }
+          = form_group_attribute(attr["attribute"])
+
+    %div#community.mt-4
+      = metadata_section('contacts-panel', 'Contacts', parent_id: "community", collapsed: !@required_only  || !@submission.id.nil?) do
+        -# Contact(s)
+        = attribute_form_group_container('contact' ,required: true) do |c|
+          - @submission.contact = [] unless @submission.contact && @submission.contact.size > 0
+          = render NestedFormInputsComponent.new do |c|
+            - c.template do
+              = render partial: "submissions/submission_contact_form", locals: {contact: nil, index: 'NEW_RECORD'}
+            - @submission.contact.each_with_index do |contact, i|
+              - c.row do
+                = render partial: "submissions/submission_contact_form", locals: {contact: contact, index: i}
+
+        = form_group_attribute("hasContributor")
+        = form_group_attribute("hasCreator")
+
+      = metadata_section('more-community-info', 'More community information', parent_id: "community") do
+        - for attr in @metadata.select { |m| m['display'] == 'community' }
+          = form_group_attribute(attr["attribute"])
+
+      = metadata_section('more-people-info', 'More people information', parent_id: "community") do
+        - for attr in @metadata.select { |m| m['display'] == 'people' }
+          = form_group_attribute(attr["attribute"])
+
+    %div#ontology-relations-more.mt-4
+      = metadata_section('ontology-relations', 'Ontology relations', parent_id: "ontology-relations-more") do
+        = form_group_attribute("useImports")
+        = form_group_attribute("hasPriorVersion")
+        = form_group_attribute("isAlignedTo")
+        = form_group_attribute("ontologyRelatedTo")
+
+      = metadata_section('more-relations', 'More relations', parent_id: "ontology-relations-more") do
+        - for attr in @metadata
+          - if attr["display"].eql?("relations")
+            = form_group_attribute(attr["attribute"])
+
+    %div#ontology-content-metrics.mt-4
+      = metadata_section('ontology-content', 'Ontology content', parent_id: "ontology-content-metrics") do
+        = form_group_attribute("preferredNamespacePrefix")
+        = form_group_attribute("preferredNamespaceUri")
+
+      = metadata_section('more-informations', 'More content informations', parent_id: "ontology-content-metrics") do
+        - for attr in @metadata.select { |m| m['display'] == 'content' }
+          = form_group_attribute(attr["attribute"])
+
+      = metadata_section('more-metrics-informations', 'More metrics informations', parent_id: "ontology-content-metrics") do
+        - for attr in @metadata.select { |m| m['display'] == 'metrics' }
+          = form_group_attribute(attr["attribute"])
\ No newline at end of file
diff --git a/app/views/submissions/_submission_contact_form.html.haml b/app/views/submissions/_submission_contact_form.html.haml
new file mode 100644
index 0000000000..590a9dd6c8
--- /dev/null
+++ b/app/views/submissions/_submission_contact_form.html.haml
@@ -0,0 +1,7 @@
+%div.d-flex
+  %div.w-50.mx-1.mt-3
+    = render FormGroupComponent.new(name: object_name, method: "contact[#{index.to_s.upcase}][name]", label: 'Name' ) do |c1|
+      = text_field c1.name, "contact[#{index.to_s.upcase}][name]", value: contact ? contact["name"] : '' , class: "form-control flex-grow-1 mx-2"
+  %div.w-50.mx-1.mt-3
+    = render FormGroupComponent.new(name: object_name, method: "contact[#{index.to_s.upcase}][email]", label: 'Email' ) do |c2|
+      = text_field c2.name, "contact[#{index.to_s.upcase}][email]", value: contact ? contact["email"] : '', class: "form-control flex-grow-1 mx-2"
diff --git a/app/views/submissions/_submission_format_form.html.haml b/app/views/submissions/_submission_format_form.html.haml
new file mode 100644
index 0000000000..fc2a1ba51d
--- /dev/null
+++ b/app/views/submissions/_submission_format_form.html.haml
@@ -0,0 +1,70 @@
+:javascript
+
+  function ontologyFormatChange(event){
+    let selected = event.target.selectedOptions.item(0)
+    let options = document.querySelectorAll('.format_options')
+    Array.from(options).forEach( x => $(x).hide())
+    switch(selected.value){
+      case 'OWL':
+        jQuery("#owl_options").show()
+        break
+      case 'SKOS':
+        jQuery("#skos_options").show()
+        break
+    }
+  }
+
+= attribute_form_group_container('hasOntologyLanguage', label: 'Format', required: true) do |c|
+  - ont_formats = %w[OBO OWL UMLS SKOS].sort
+  - selected = @submission.hasOntologyLanguage ? @submission.hasOntologyLanguage : "OWL"
+  = select c.name,  c.method_name, options_for_select(ont_formats, selected), {required: true}, {class: "form-control", onchange: 'ontologyFormatChange(event)'}
+  - c.help do
+    %div#skos_options.format_options{style: "display:#{skos? ? 'block': 'none'}"}
+      SKOS vocabularies submitted to BioPortal must contain a minimum of one concept scheme and top concept assertion.
+      Please refer to the NCBO wiki for a more #{link_to 'detailed explanation', 'https://www.bioontology.org/wiki/index.php/SKOSSupport', target: "_blank" }
+      with examples.
+
+%div#owl_options.form-group.row.format_options
+  %div.col-sm-8.offset-sm-4
+    %a#collapseOWLOptions{href: "#owl-options-properties", role: "button", data: {toggle: "collapse"}, aria: {expanded: "false", controls: "owl-options"},
+                class: "btn btn-outline-secondary btn-sm"} Show advanced OWL options
+
+  %div#owl-options-properties.collapse
+    %div.form-group.row
+      %div.col-sm-8.offset-sm-2
+        %label.lead Customize default property settings
+        = attribute_text_field_container('prefLabelProperty', label: 'Preferred name', inline: false) do |c|
+          - c.help do
+            Enter a property ID, or leave blank to use the default setting:
+            = link_to 'http://www.w3.org/2004/02/skos/core#prefLabel', 'http://www.w3.org/2004/02/skos/core#prefLabel', target: "_blank"
+
+        = attribute_text_field_container('synonymProperty', label: 'Synonym', inline: false) do |c|
+          - c.help do
+            Enter a property ID, or leave blank to use the default setting:
+            = link_to 'http://www.w3.org/2004/02/skos/core#altLabel', 'http://www.w3.org/2004/02/skos/core#altLabel', target: "_blank"
+
+
+        = attribute_text_field_container('definitionProperty', label: 'Definition', inline: false) do |c|
+          - c.help do
+            Enter a property ID, or leave blank to use the default setting:
+            = link_to 'http://www.w3.org/2004/02/skos/core#definition', 'http://www.w3.org/2004/02/skos/core#definition', target: "_blank"
+
+
+        = attribute_text_field_container('authorProperty', label: 'Author', inline: false) do |c|
+          - c.help do
+            Enter a property ID, or leave blank to use the default setting:
+            = link_to 'http://purl.org/dc/elements/1.1/creator', 'http://purl.org/dc/elements/1.1/creator', target: "_blank"
+
+
+    %div.form-group.row
+      %div.col-sm-8.offset-sm-2
+        %label.lead Identify obsolete classes
+        = attribute_text_field_container('obsoleteProperty', label: 'Obsolete property', inline: false) do |c|
+          - c.help do
+            Optionally enter a property ID that indicates obsolete status for ontology classes
+            (the property value must be set to "true"). Note that by default, BioPortal checks for existence of the owl:deprecated property.
+
+        = attribute_text_field_container('obsoleteParent', label: 'Obsolete branch root', inline: false) do |c|
+          - c.help do
+            Optionally enter a class ID for the root of an obsolete branch. All classes in the branch will be marked as
+            obsolete, with the exception of the root class.
diff --git a/app/views/submissions/_submission_location_form.html.haml b/app/views/submissions/_submission_location_form.html.haml
new file mode 100644
index 0000000000..07faedf614
--- /dev/null
+++ b/app/views/submissions/_submission_location_form.html.haml
@@ -0,0 +1,61 @@
+:javascript
+  $(document).ready(function() {
+
+    // Properly display the information for 'File Location' based on radio button
+    if (jQuery("#submission_isRemote_0").is(":checked")) {
+      location_toggle("upload");
+    }
+    if (jQuery("#submission_isRemote_1").is(":checked")) {
+      location_toggle("remote");
+    }
+
+    // Select default 'File Location' radio button
+    if (!jQuery("#submission_isRemote_0").is(":checked") && !jQuery("#submission_isRemote_1").is(":checked") && !jQuery("#submission_isRemote_2").is(":checked")) {
+      jQuery("#submission_isRemote_0").attr("checked", "checked")
+    }
+  });
+
+  // Show/hide location inputs
+  function location_toggle(input_div) {
+    jQuery('.hidden_field').hide();
+    jQuery('.hidden_field input').attr("disabled", true);
+    jQuery('#' + input_div + " input").removeAttr("disabled");
+    jQuery('#' + input_div).show();
+  }
+
+
+- if !@masterFileOptions
+  %div.form-check
+    - checked = @ontology.summaryOnly
+    = radio_button(object_name, :isRemote, 3, :onclick=>"$('.hidden_field').hide();", checked: checked, aria: {describedBy: "metadataHelpBlock"}, class: "form-check-input")
+    %label.form-check-label{for: "submission_isRemote_3"}
+      Metadata only
+    %small.form-text.text-muted#metadataHelpBlock Allow users to view and search your ontology metadata, but not its classes and properties.
+  %div.form-check
+    - checked = !(@submission.pullLocation.nil? || @submission.pullLocation.empty?)
+    = radio_button(object_name, :isRemote, 1, :onclick=>"location_toggle('remote');", checked: checked, aria: {describedBy: "loadFromURLHelpBlock"}, class: "form-check-input")
+    %label.form-check-label{for: "submission_isRemote_1"}
+      Load from URL
+    %small.form-text.text-muted#loadFromURLHelpBlock New versions loaded on a nightly basis.
+    - display = (checked and "" or "display:none;")
+    %div.hidden_field#remote{style: display}
+      = text_field(object_name, :pullLocation, value: @submission.pullLocation, aria: {describedBy: "enterURLHelpBlock"}, class: "form-control")
+      %small.form-text.text-muted#enterURLHelpBlock Enter a URL, including the name of your ontology source file, e.g., http://www.example.com/my_ontology.owl.
+  %div.form-check
+    - checked = (!@ontology.summaryOnly) && @submission.pullLocation.nil?
+    = radio_button(object_name, :isRemote, 0, :onclick=>"location_toggle('upload');", checked: checked, class: "form-check-input")
+    %label.form-check-label{for: "submission_isRemote_0"}
+      Upload local file
+    - display = (checked and "" or "display:none;")
+    %div.hidden_field#upload{style: display}
+      = file_field(object_name, :filePath, class: "mt-2")
+- else
+  -# TODO: Has this section of code actually been tested?
+  = radio_button object_name, :isRemote, 0, :onclick=>"location_toggle('upload');", checked: true
+  Upload Local File
+  %br/
+  %span{:style => "font-size:11px;"} (choose a file on your local file system to upload)
+  - display = (checked and "" or "display:none;")
+  %div#upload{style: display}
+    = file_field object_name, :filePath, required: true
+    = select(object_name, "masterFileName", @masterFileOptions, { include_blank: "Select primary file from zip contents", required: true}, {style: "border-color: red;"})
diff --git a/app/views/submissions/_submissions.html.haml b/app/views/submissions/_submissions.html.haml
new file mode 100644
index 0000000000..6a666118f1
--- /dev/null
+++ b/app/views/submissions/_submissions.html.haml
@@ -0,0 +1,77 @@
+= turbo_frame_tag id do
+  - return "" if @ontology.metadata_only?
+
+  - more_colspan = 7
+  - more_colspan = 6 if @ont_restricted
+
+  %div.click_versions_collapse
+    = render_alerts_container(AdminController)
+    %table#ontology_versions.table.table-sm.table-striped
+      %thead
+        %tr
+          - if @ontology.admin?(session[:user])
+            %th.align-middle ID
+          %th.align-middle Version
+          %th
+            = generate_attribute_text("released", "Released")
+          %th
+            = generate_attribute_text("modificationDate", "Modified")
+          %th
+            = generate_attribute_text("creationDate", "Uploaded")
+          - unless @ont_restricted
+            %th.align-middle Downloads
+          - if @ontology.admin?(session[:user])
+            %th.align-middle Actions
+
+      - begin
+        - submission_ready = @ontology.explore.latest_submission({:include_status => 'ready', display: 'submissionId'})
+        - submission_readyId = submission_ready.submissionId unless submission_ready.nil?
+      - rescue
+        - submission_readyId = -1
+      - @submissions.each_with_index do |sub, index|
+        - hidden_row_class = index >= 5 ? "hidden_ont hidden_select" : ""
+        %tr{class: "#{hidden_row_class}", id: "submission_#{sub.submissionId}"}
+          - if @ontology.admin?(session[:user])
+            %td
+              =  sub.submissionId
+          %td
+            = raw status_link(sub, sub.submissionId==submission_readyId)
+          %td
+            = xmldatetime_to_date(sub.released) unless sub.released.nil?
+          %td
+            = xmldatetime_to_date(sub.modificationDate) unless sub.modificationDate.nil?
+          %td
+            = xmldatetime_to_date(sub.creationDate) unless sub.creationDate.nil?
+          - unless @ont_restricted
+            %td
+              = raw download_link(sub, @ontology)
+          - if @ontology.admin?(session[:user])
+            %td
+              %div.d-flex
+                %a.btn.btn-sm.btn-link{:href => "/ontologies/#{@ontology.acronym}/submissions/#{sub.submissionId}/edit"}
+                  %span Edit
+                - unless index.zero?
+                  - alert_text = "Are you sure you want to delete submission <span style='color:red;font-weight:bold;'>" + sub.submissionId.to_s + "</span> for ontology <span style='color:red;font-weight:bold;'>" + @ontology.acronym + "</span>?<br/><b>This action CAN NOT be undone!!!</b>"
+                  = button_to "Delete", "/admin/ontologies/#{@ontology.acronym}/submissions/#{sub.submissionId}?turbo_stream=true", method: :delete, class:'btn btn-sm btn-link',  form: {data: { turbo: true, turbo_confirm: alert_text, turbo_frame: '_top'}}
+
+      - if @submissions.length > 5
+        %tr
+          %td{colspan: more_colspan, class: "show_more_subs"}
+            %a#version_toggle{:href => ""} more...
+
+  :javascript
+    jQuery(document).ready(() => {
+      jQuery("#version_toggle").click( (event) => {
+          event.preventDefault();
+          jQuery("#ontology_versions tr.hidden_select").toggleClass("hidden_ont")
+          const oldText = event.target.innerHTML
+          switch (oldText) {
+            case 'more...':
+              event.target.innerHTML = 'less...'
+              break
+            case 'less...':
+              event.target.innerHTML = 'more...'
+              break
+          }
+      })
+    })
\ No newline at end of file
diff --git a/app/views/submissions/edit.html.haml b/app/views/submissions/edit.html.haml
index 71720f85a9..172a4f761c 100644
--- a/app/views/submissions/edit.html.haml
+++ b/app/views/submissions/edit.html.haml
@@ -1,5 +1,3 @@
-- @title = "Edit ontology submission"
-
 %div.container.py-4.py-md-5
   %h3.text-center.mb-4
     Edit submission information
diff --git a/app/views/submissions/index.html.haml b/app/views/submissions/index.html.haml
new file mode 100644
index 0000000000..d31fd94d2d
--- /dev/null
+++ b/app/views/submissions/index.html.haml
@@ -0,0 +1 @@
+= render partial: "submissions", locals: {id: 'ontology_submissions'}
\ No newline at end of file
diff --git a/app/mailers/.gitkeep b/app/views/subscribe_mailer/register_for_announce_list.erb
similarity index 100%
rename from app/mailers/.gitkeep
rename to app/views/subscribe_mailer/register_for_announce_list.erb
diff --git a/app/views/subscribe_mailer/unregister_for_announce_list.erb b/app/views/subscribe_mailer/unregister_for_announce_list.erb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml
index a3306597fe..4697bc2d8d 100644
--- a/app/views/users/_form.html.haml
+++ b/app/views/users/_form.html.haml
@@ -1,38 +1,53 @@
-%table.form{:width => "70%"}
-  %tr
-    %th First Name:
-    %td.top= text_field :user, :firstName, value: @user.firstname
-  %tr
-    %th Last Name:
-    %td= text_field :user, :lastName, value: @user.lastname
-  %tr
-    %th Account Name:*
-    %td= text_field :user, :username, value: @user.username
-  %tr
-    %th Email Address:*
-    %td= text_field :user, :email, value: @user.email
-  %tr
-    %th Re-enter Email Address:*
-    %td= text_field :user, :email_confirmation, value: @user.email_confirmation
-  %tr
-    %th Password:*
-    %td= password_field :user, :password, :autocomplete => "off"
-  %tr
-    %th Re-enter Password:*
-    %td= password_field :user, :password_confirmation, :autocomplete => "off"
-  - if using_captcha?
-    %tr
-      %th
-      %td= recaptcha_tags
-  - unless $ANNOUNCE_LIST.nil? || $ANNOUNCE_LIST.empty?
-    %tr
-      %td{:colspan => "2", :style => "text-align: right;"}
-        %div{:style => "float: right; margin-left: 10px; position: relative; top: 5px;"}
-          %input#user_register_mail_list{:checked => "checked", :name => "user[register_mail_list]", :type => "checkbox", :value => "1"}/
-        %div{:style => "overflow: hidden; line-height: 12px;"}
-          %label{:for => "user_register_mail_list"}
-            Register for the #{$SITE} announcements email list
-            %br/
-            %span{:style => "font-size: x-small;"} (approximately two emails per month -- confirmation via email required)
-  %tr
-    %td{:colspan => "2", :style => "text-align: right;"}= submit_tag "Create"
+.d-flex.justify-content-center
+  .register-form
+    .d-flex.justify-content-between
+      %a{:href => "javascript:javascript:history.go(-1)"}
+        %img.lost-password-arrowback{:src => "#{asset_path("arrow-back.svg")}"}
+      .register-title-container
+        %h2.register-title
+          Create new account
+        %hr#register-title-line/
+      %div
+    .register-double-input
+      .register-first-input
+        %p.register-input-title
+          First name
+          %font{:color => "red"} *
+        = text_field :user, :firstName, value: @user.firstname, class: "register-input-short"
+      %div
+        %p.register-input-title
+          Last name
+          %font{:color => "red"} *
+        = text_field :user, :lastName, value: @user.lastname, class: "register-input-short"
+    %p.register-input-title
+      Username
+      %font{:color => "red"} *
+    = text_field :user, :username, value: @user.username, class: "register-input-long"
+    %p.register-input-title
+      ORCID ID
+      %font.register-optional (optional)
+    %img.register-input-icon{:src => "#{asset_path("orcid.svg")}"}/
+    = text_field :user, :orcidId, value: @user.orcidId, class: "register-input-long register-input-with-icon"
+    %p.register-input-title
+      Github ID
+      %font.register-optional (optional)
+    %img.register-input-icon{:src => "#{asset_path("github-icon.svg")}"}/
+    = text_field :user, :githubId, value: @user.githubId, class: "register-input-long register-input-with-icon"
+    %p.register-input-title
+      Email
+      %font{:color => "red"} *
+    = text_field :user, :email, value: @user.email, class: "register-input-long"
+    %p.register-input-title
+      Password
+      %font{:color => "red"} *
+    = password_field :user, :password, class: "register-input-long"
+    %p.register-input-title
+      Confirm password
+      %font{:color => "red"} *
+    = password_field :user, :password_confirmation, class: "register-input-long"
+    - if using_captcha?
+      = recaptcha_tags
+    .d-flex
+      %input#user_register_mail_list{:checked => "checked", :name => "user[register_mail_list]", :type => "checkbox", :value => "1"}/
+      %p#register-check-text Register for the AgroPortal's mailing list
+    %input.register-button{:type => "submit", :value => "Register"}/
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
index 8f09e6e474..95b41374ee 100644
--- a/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
@@ -1,12 +1,9 @@
 - @title = "Register"
-%div{:style => "padding: 1em;"}
-  %h1
-    New #{$SITE} Account
-  = form_for(:user, :url => users_path) do |f|
-    - unless @errors.nil?
-      .enable-lists{:style => "color: red; padding: 1em;"}
-        Errors creating your account:
-        %ul
-          - for error in @errors
-            %li= error
-    = render :partial => 'form', :locals => {:f => f}
+= form_for(:user, :url => users_path) do |f|
+  - unless @errors.nil?
+    .enable-lists{:style => "color: red; padding: 1em;"}
+      Errors creating your account:
+      %ul
+        - for error in @errors
+          %li= error
+  = render :partial => 'form', :locals => {:f => f}
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 80df26f7ed..533b5a6bc8 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -27,11 +27,12 @@
 
 
   - unless @user.subscription.nil? || @user.subscription.empty?
-    %h2 Subscriptions
+    %h2{style: "font-size: large;"} Subscriptions
     %table
       - @user.subscription.each do |subscription|
-        - ont = (!subscription[:ontology].nil? ? subscription[:ontology].split('/').last: nil) # ensure we get the acronym
-        - type = (!subscription[:notification_type].nil? ? subscription[:notification_type].downcase : nil)
+        - ont_id = subscription[:ontology]
+        - ont = ont_id.nil? ? nil: subscription[:ontology].split('/').last
+        - type = subscription[:notification_type].nil? ? nil : subscription[:notification_type].downcase
         %tr{style: "padding: 5px;"}
           %td{style: "padding: 5px;"}
             %a{href: "/ontologies/#{ont}"}= ont
@@ -42,7 +43,7 @@
               = type
           %td{style: "padding: 5px;"}
             .subscribe_to_ontology{style: "float: left;"}
-              = raw subscribe_ontology_button(ont, @user)
+              = subscribe_button(ont_id)
     %br/
 
   - unless @user_projects.nil? || @user_projects.empty?
@@ -66,38 +67,8 @@
   :javascript
     jQuery(document).ready(function(){
       jQuery("#edit_custom_ontologies").click(editCustomOntologies);
-      // Wire up subscriptions button activity
-      jQuery("a.subscribe_to_ontology").live("click", function(){
-        subscribeToOntology(this);
-      });
     });
 
-    function subscribeToOntology(button) {
-      var ontologyId = jQuery(button).attr("data-bp_ontology_id");
-      var isSubbed = jQuery(button).attr("data-bp_is_subbed");
-      var userId = jQuery(button).attr("data-bp_user_id");
-      jQuery(".subscribe_error").html("");
-      jQuery(".subscribe_spinner").show();
-      jQuery.ajax({
-        type: "POST",
-        url: "/subscriptions?user_id="+userId+"&ontology_id="+ontologyId+"&subbed="+isSubbed,
-        dataType: "json",
-        success: function(data) {
-          jQuery(".subscribe_spinner").hide();
-          // Toggle subbed value on a element
-          var subbedVal = (isSubbed === "true") ? "false" : "true";
-          jQuery("a.subscribe_to_ontology").attr("data-bp_is_subbed", subbedVal);
-          // Change button text
-          var txt = jQuery("a.subscribe_to_ontology").html();
-          var newButtonText = txt.match("Unsubscribe") ? txt.replace("Unsubscribe", "Subscribe") : txt.replace("Subscribe", "Unsubscribe");
-          jQuery("a.subscribe_to_ontology").html(newButtonText);
-        },
-        error: function(data) {
-          jQuery(".subscribe_spinner").hide();
-          jQuery(".subscribe_error").html("Problem subscribing to emails, please try again");
-        }
-      });
-    }
 
     function editCustomOntologies() {
       jQuery("#custom_ontologies_picker").css("left", "").css("position", "");
@@ -131,6 +102,31 @@
               #{ont.name} (#{ont.acronym})
       - else
         %p{style: "padding-left: 7px;"} You haven't picked any ontologies yet
+
+        %div
+          %h2{style:"margin-top:18px; font-size: large;"} Mailing list service
+
+          %div{style:"margin-top:12px"}
+            %div
+              %button.btn.btn-primary{id: "subscribe"}
+                Subscribe
+              %span to the #{$ANNOUNCE_LIST} user mailing list
+            %div.mt-1
+              %button.btn.btn-primary{id: "unsubscribe"}
+                Unsubscribe
+              %span from the #{$ANNOUNCE_LIST} user mailing list
+
+
+            :javascript
+              document.getElementById('subscribe').addEventListener('click', function() {
+                  window.location.href = "/users/subscribe/" + "#{@user.username}"
+
+              });
+
+              document.getElementById('unsubscribe').addEventListener('click', function() {
+                  window.location.href = "/users/un-subscribe/" + "#{@user.email}"
+              });
+
   #custom_ontologies_picker{style: "left: -9999px; position: absolute;"}
     = form_tag custom_ontologies_path(url_encode(@user.username)) do
       - selected = @user.customOntology.map {|o| LinkedData::Client::Models::Ontology.get(o).acronym}
diff --git a/bin/docker-entrypoint-web b/bin/docker-entrypoint-web
deleted file mode 100755
index bc53300d5d..0000000000
--- a/bin/docker-entrypoint-web
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-
-# Sprockets will use the first sprockets file it finds not the latest one. We
-# need to delete all of the old sprockets files except for the one that was
-# last built into the image. That's what the code below does.
-
-# shellcheck disable=SC2125
-manifest_files=/app/public/assets/.sprockets-manifest-*.json
-
-if compgen -G "${manifest_files}" > /dev/null 2>&1; then
-  # shellcheck disable=SC2086,SC2061
-  find \
-    ${manifest_files} \
-    -type f ! -name "$(basename /public/assets/.sprockets-manifest-*.json)" \
-    -delete
-fi
-
-
-
-exec "$@"
diff --git a/config/bioportal_config_env.rb.sample b/config/bioportal_config_env.rb.sample
index 52bf20072e..4c83979d03 100644
--- a/config/bioportal_config_env.rb.sample
+++ b/config/bioportal_config_env.rb.sample
@@ -50,6 +50,11 @@ $REST_URL = "http://example.org:8080/"
 #$ANNOTATOR_URL = "http://services.stageportal.lirmm.fr/annotator"
 $ANNOTATOR_URL = "#{$REST_URL}/annotator"
 
+# Announcements sympa mailing list REQUEST address, EX: list-request@lists.example.org
+$ANNOUNCE_LIST_SERVICE ||= "SERVICE_EXAMPLE"
+$ANNOUNCE_SERVICE_HOST ||= "service@test.com"
+$ANNOUNCE_LIST||= "users-list@test"  
+
 # Used to define other bioportal that can be mapped to
 # Example to map to ncbo bioportal : {"ncbo" => {"api" => "http://data.bioontology.org", "ui" => "http://bioportal.bioontology.org", "apikey" => ""}
 # Then create the mapping using the following class in JSON : "http://purl.bioontology.org/ontology/MESH/C585345": "ncbo:MESH"
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 2eeef966fe..15e0202651 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -4,7 +4,7 @@
 Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
-# Rails.application.config.assets.paths << Emoji.images_path
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
diff --git a/config/routes.rb b/config/routes.rb
index 3daff2f481..057297ac71 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,10 @@
 
   root to: 'home#index'
 
+  get '/notes/new_comment', to: 'notes#new_comment'
+  get '/notes/new_proposal', to: 'notes#new_proposal'
+  get '/notes/new_reply', to: 'notes#new_reply'
+  delete '/notes', to: 'notes#destroy'
   resources :notes, constraints: { id: /.+/ }
 
   resources :ontolobridge do
@@ -14,6 +18,9 @@
 
   resources :reviews
 
+  get '/users/subscribe/:username', to: 'users#subscribe'
+  get '/users/un-subscribe/:email', to: 'users#un_subscribe'
+
   get '/mappings/loader' , to: 'mappings#loader'
   post '/mappings/loader', to: 'mappings#loader_process'
   get 'mappings/count/:id', to: 'mappings#count', constraints: { id: /.+/ }
@@ -60,6 +67,15 @@
   get 'change_requests/create_synonym'
   match 'change_requests', to: 'change_requests#create', via: :post
 
+  # resource for metadata ontologies
+  scope :ontologies_metadata_curator do
+    post '/result', to: 'ontologies_metadata_curator#result'
+    post '/edit', to: 'ontologies_metadata_curator#edit'
+    put '/update', to: 'ontologies_metadata_curator#update'
+    get '/:ontology/submissions/:submission_id/attributes/:attribute', to: 'ontologies_metadata_curator#show_metadata_value'
+    get '/:ontology/submissions/:submission_id', to: 'ontologies_metadata_curator#show_metadata_by_ontology'
+  end
+    
   get '' => 'home#index'
 
   # Top-level pages
@@ -92,7 +108,8 @@
   match '/ontologies/:acronym' => 'ontologies#update', via: [:get, :post]
   match '/ontologies/:acronym/submissions/:id' => 'submissions#update', via: [:get, :post]
   get '/ontologies/:ontology_id/submissions/new' => 'submissions#new', :ontology_id => /.+/
-  match '/ontologies/:ontology_id/submissions' => 'submissions#create', :ontology_id => /.+/, via: [:get, :post]
+  match '/ontologies/:ontology_id/submissions' => 'submissions#create', :ontology_id => /.+/, via: [:post]
+  match '/ontologies/:ontology_id/submissions' => 'submissions#index', :ontology_id => /.+/, via: [:get]
   get '/ontologies/:acronym/classes/:purl_conceptid', to: 'ontologies#show', constraints: { purl_conceptid: /[^\/]+/ }
   get '/ontologies/:acronym/: f', to: 'ontologies#show', constraints: { purl_conceptid: /[^\/]+/ }
   match '/ontologies/:acronym/submissions/:id/edit_metadata' => 'submissions#edit_metadata', via: [:get, :post]
@@ -102,6 +119,7 @@
 
   # Notes
   get 'ontologies/:ontology/notes/:noteid', to: 'notes#virtual_show', as: :note_virtual, noteid: /.+/
+  get 'ontologies/:ontology/notes', to: 'notes#virtual_show'
 
   # Ajax
   get '/ajax/' => 'ajax_proxy#get', :as => :ajax
@@ -133,6 +151,7 @@
   # User
   get '/logout' => 'login#destroy', :as => :logout
   get '/lost_pass' => 'login#lost_password'
+  get '/lost_pass_success' => 'login#lost_password_success'
   get '/reset_password' => 'login#reset_password'
   post '/accounts/:id/custom_ontologies' => 'users#custom_ontologies', :as => :custom_ontologies
   get '/login_as/:login_as' => 'login#login_as' , constraints: { login_as:  /[\d\w\.\-\%\+ ]+/ }
@@ -160,7 +179,6 @@
   match '/admin/update_check_enabled' => 'admin#update_check_enabled', via: [:get]
   match '/admin/users' => 'admin#users', via: [:get]
 
-
   # Ontolobridge
   # post '/ontolobridge/:save_new_term_instructions' => 'ontolobridge#save_new_term_instructions'
 
@@ -189,5 +207,5 @@
   get '/visualize' => 'ontologies#visualize', :as => :visualize_concept, :constraints => { ontology: /[^\/?]+/, id: /[^\/?]+/, ontologyid: /[^\/?]+/, conceptid: /[^\/?]+/ }
 
   get '/exhibit/:ontology/:id' => 'concepts#exhibit'
-
+   
 end
diff --git a/config/settings.yml b/config/settings.yml
index acbda3112c..0a8d2dbbd6 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -20,6 +20,7 @@ shared:
     virtual_appliance: 'https://ontoportal.github.io/administration/'
     widgets: 'http://www.bioontology.org/wiki/NCBO_Widgets'
     wiki: 'https://www.bioontology.org/wiki/'
+    mappings: 'https://www.bioontology.org/wiki/BioPortal_Help#Mappings_Tab'
 
 development:
   links:
diff --git a/db/schema.rb b/db/schema.rb
index 2c960edc08..51716810eb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2021_11_30_230915) do
+ActiveRecord::Schema[7.0].define(version: 2020_09_21_120918) do
   create_table "analytics", id: :integer, charset: "utf8mb3", force: :cascade do |t|
     t.string "segment"
     t.string "action"
diff --git a/docker-compose.yml b/docker-compose.yml
index a455af4eca..38be0278fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,8 @@ services:
     profiles: ["db"]
     ports:
       - "3306:3306"
+    volumes:
+      - db-v:/var/lib/mysql
   cache:
     deploy:
       resources:
@@ -45,5 +47,6 @@ services:
     profiles: ["web"]
     command: "yarn build --watch"
 volumes:
+  db-v:
   bundle:
   node:
diff --git a/package.json b/package.json
index 0d280e69d1..d112843e7c 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,10 @@
     "@hotwired/stimulus": "^3.0.1",
     "@hotwired/turbo-rails": "^7.1.1",
     "esbuild": "^0.14.41",
-    "split.js": "^1.6.5"
+    "flatpickr": "^4.6.13",
+    "split.js": "^1.6.5",
+    "stimulus-flatpickr": "^3.0.0-0",
+    "stimulus-rails-nested-form": "^4.0.0"
   },
   "scripts": {
     "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds"
diff --git a/spec/mailers/subscribe_spec.rb b/spec/mailers/subscribe_spec.rb
new file mode 100644
index 0000000000..a2b7391c33
--- /dev/null
+++ b/spec/mailers/subscribe_spec.rb
@@ -0,0 +1,35 @@
+require "rails_helper"
+
+RSpec.describe SubscribeMailer, type: :mailer do
+  
+  describe "register for announce list" do
+    let(:mail) { SubscribeMailer.register_for_announce_list("user@lirmm.fr","user_fn","user_ln") }
+
+    it "renders the headers" do
+      expect(mail.subject).to eq("subscribe #{$ANNOUNCE_LIST} user_fn user_ln")
+      expect(mail.to).to eq([$ANNOUNCE_SERVICE_HOST])
+      expect(mail.from).to eq(["user@lirmm.fr"])
+    end
+
+    it "renders the body" do
+      expect(mail.body.encoded).to match("")
+    end
+
+  end
+
+  describe "unregister for announce list" do
+    let(:mail) { SubscribeMailer.unregister_for_announce_list("user@lirmm.fr") }
+
+    it "renders the headers" do
+      expect(mail.subject).to eq("unsubscribe #{$ANNOUNCE_LIST}")
+      expect(mail.to).to eq([$ANNOUNCE_SERVICE_HOST])
+      expect(mail.from).to eq(["user@lirmm.fr"])
+    end
+
+    it "renders the body" do
+      expect(mail.body.encoded).to match("")
+    end
+
+  end
+
+end
diff --git a/yarn.lock b/yarn.lock
index 963710abc5..b3e75bb55e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,156 +2,179 @@
 # yarn lockfile v1
 
 
-"@hotwired/stimulus@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.0.1.tgz#141f15645acaa3b133b7c247cad58ae252ffae85"
-  integrity sha512-oHsJhgY2cip+K2ED7vKUNd2P+BEswVhrCYcJ802DSsblJFv7mPFVk3cQKvm2vHgHeDVdnj7oOKrBbzp1u8D+KA==
+"@esbuild/linux-loong64@0.14.54":
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028"
+  integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==
+
+"@hotwired/stimulus@^3.0.0", "@hotwired/stimulus@^3.0.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.1.tgz#e3de23623b0c52c247aba4cd5d530d257008676b"
+  integrity sha512-HGlzDcf9vv/EQrMJ5ZG6VWNs8Z/xMN+1o2OhV1gKiSG6CqZt5MCBB1gRg5ILiN3U0jEAxuDTNPRfBcnZBDmupQ==
 
 "@hotwired/turbo-rails@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.1.3.tgz#a4e04ecb800a06e7f9aa6e298170fa4580b74216"
-  integrity sha512-6qKgn75bMWKx0bJgmSfrdC73EJkGLoSWZPAssvcd3nE7ZpDZff6f67j5OQNjjpRgNB7OFruom6VWguGQGu1fQg==
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.2.4.tgz#d155533e79c4ebdac23e8fe12697d821d5c06307"
+  integrity sha512-givDUQqaccd19BvErz1Cf2j6MXF74m0G6I75oqFJGeXAa7vwkz9nDplefVNrALCR9Xi9j9gy32xmSI6wD0tZyA==
   dependencies:
-    "@hotwired/turbo" "^7.1.0"
+    "@hotwired/turbo" "^7.2.4"
     "@rails/actioncable" "^7.0"
 
-"@hotwired/turbo@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.1.0.tgz#27e44e0e3dc5bd1d4bda0766d579cf5a14091cd7"
-  integrity sha512-Q8kGjqwPqER+CtpQudbH+3Zgs2X4zb6pBAlr6NsKTXadg45pAOvxI9i4QpuHbwSzR2+x87HUm+rot9F/Pe8rxA==
+"@hotwired/turbo@^7.2.4":
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.2.4.tgz#0d35541be32cfae3b4f78c6ab9138f5b21f28a21"
+  integrity sha512-c3xlOroHp/cCZHDOuLp6uzQYEbvXBUVaal0puXoGJ9M8L/KHwZ3hQozD4dVeSN9msHWLxxtmPT1TlCN7gFhj4w==
 
 "@rails/actioncable@^7.0":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.3.tgz#71f08e958883af64f6a20489318b5e95d2c6dc5b"
-  integrity sha512-Iefl21FZD+ck1di6xSHMYzSzRiNJTHV4NrAzCfDfqc/wPz4xncrP8f2/fJ+2jzwKIaDn76UVMsALh7R5OzsF8Q==
-
-esbuild-android-64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.41.tgz#34de1b983a81b22207db6faf937a600f15c5ca9b"
-  integrity sha512-byyo8LPOGHzAqxbwh2Q72d7L+rXXTsr/KALjsiCySrJ60CGMe80i3bwoQ+WODxsGaH08R//yg5oc7xHKgQz4uw==
-
-esbuild-android-arm64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.41.tgz#42ff3d409d4962342a67aef3d2caa9be502e3def"
-  integrity sha512-7koo9Dm/mwK4M8PGQX8JQRc4UQ4Wj7DT1nD4BQkVs2jxtHbYOlnsQH0fneKSXZVmnBIHYcntr/e1VU5gnYLvGQ==
-
-esbuild-darwin-64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.41.tgz#73d8789b59c6086cfeba9aa59f60cb12cfbe4439"
-  integrity sha512-kW8fC2auh9jjmBXudTmlMfbBCMYMuujhxG40CxMhKiQ8NLBK4RU9yUYY6ss7QJp24kVTtKd4IvfwOio9SE53MA==
-
-esbuild-darwin-arm64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.41.tgz#faf5eecd8e8a170aea741f0f0896e73f5b0e0716"
-  integrity sha512-cO0EPkiQt0bERH9sZFIoTywWfGhEpshdpvQpDfLh/ZJLeioQfaarM9YDrmID+f7k77djh0mdyfsC6XpS0HlLsw==
-
-esbuild-freebsd-64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.41.tgz#b44923dfdf84bb3ec3a84739817ea08e4b50c0fb"
-  integrity sha512-6tsMDK6b7czCOjsr68BgVogFXcTCWL3T7yFXRFuAmXwY9ybYgX8sybD7ztrRB03dLAPeMxHo+PzeMD6LdVrLdQ==
-
-esbuild-freebsd-arm64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.41.tgz#91dac0d5d5a3f9dc4a422628556bd64c98d62c1e"
-  integrity sha512-AQ2S/VCLKVBe/+HNiFLyp3w9i7AEtCOWEzKHSkfHk0VO5bPzHd7WJfWmj1Bxliu7vdPESbiDUTJIH3rDt4bzSA==
-
-esbuild-linux-32@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.41.tgz#6342094df325df46ad7a3d920af7af04c1a495a9"
-  integrity sha512-sb7Kah5Px6BNZ6gzm0nJLuDeAJKbIlaKIoI9zgZ5dFDxZSn91TMAHJz5W39YDJ8+ZaGJYIdqZSpDo+4G769mZw==
-
-esbuild-linux-64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.41.tgz#e7e193c229aa3988202adb92b8567ae504767b8e"
-  integrity sha512-PeI0bfbv+5ondZRhPRszptp3RQRRAPxpOB2CYDphKske5+UlCXPi4Af+T++OqhV5TEpymTfxJdJQ1sn1w32coA==
-
-esbuild-linux-arm64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.41.tgz#ca3d83b2a8ae1f160c05bdc08daa88f54279506c"
-  integrity sha512-aAhBX6kVG8hTVuANE90ORobioHdpZLzy8Fibf4XBuG4IuJfjgM5N4wFIq2Tpd+Ykit432PL/YOQhZ4W6nVc4cQ==
-
-esbuild-linux-arm@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.41.tgz#6f9b5ca9cbdb33b4751b658f7d64c0e907b64685"
-  integrity sha512-8DQ6Sv3XNwgu0cnPA3q+kJSqfOYLDqWzpW8dPF+/Or23bS/5EIT/CzN73uIhR8A3AokXIczn88VKti7Xtv+V2g==
-
-esbuild-linux-mips64le@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.41.tgz#e21b8dc51d6d3d78e4e3de0ccae20a6b0aae28a1"
-  integrity sha512-88xo4FRYQ2laMJnrqZu8j5q531XT/odZnhO5NLWO/NdweIdT8F+QL0fNIBIf+nVkC1d0Psgmt+g35GAODMDl8g==
-
-esbuild-linux-ppc64le@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.41.tgz#bd70331c3df64ed3c74947d8ec5354a7cb11abae"
-  integrity sha512-kJ0r/Cg3LzFzHhbBsvqi/hDPGKMGzFiPGOmUvqTkfVXhRUQtOMkXkyKdP7OEMRb8ctPtnptsZOOXPHRdU0NdJQ==
-
-esbuild-linux-riscv64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.41.tgz#2272aff043bf1fe7b397df25698c8f79605b9b71"
-  integrity sha512-ZJ7d/qFRx14J3aP75ccrFSZyuYZ1hu8IVfwVqyQg4jQFgNME2FMz7pZMskBJ0fSW8QcYUnN3RubFXWijyjKUug==
-
-esbuild-linux-s390x@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.41.tgz#01916946a31c1aeb2de5b1b4f21432843fb88f91"
-  integrity sha512-xeWAEZt1jAfYkYuyIUuHKpH/oj7O862Je5HTH9E+4sEfoOnZaAmFrisbXjGDKXjMRKYscFlM8wXdNBmiqQlT8g==
-
-esbuild-netbsd-64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.41.tgz#0a9d3e5c73d362f91178ad21a7e020d246a039e7"
-  integrity sha512-X/UE3Asqy594/atYi/STgYtaMQBJwtZKF0KFFdJTkwb6rtaoHCM1o482iHibgnSK7CicuRhyTZ+cNx4OFqRQAg==
-
-esbuild-openbsd-64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.41.tgz#32c0ec0678a206b0e75340f3a3303f38cb5b3408"
-  integrity sha512-6m+1dtdO+4KaU3R0UTT82hxWxWpFCjgSHhQl/PKtMmq+CvvxRQDcTwujLC843M7ChGVWNM2q1s6YCwoA0WQ9kw==
-
-esbuild-sunos-64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.41.tgz#2f6f26fbc88778382d61145d2d6ec1c6ad5d47c2"
-  integrity sha512-p96tTTcE8/WY7A4Udh+fxVUTGL8rIXOpyxyhZiXug+f7DGbjE24PbewqgIBRSDyM7xRUty+1RzqyJz73YIV6yg==
-
-esbuild-windows-32@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.41.tgz#0e7a64b739045596a83ecd9cb0af8c0d85e4d5ed"
-  integrity sha512-jS+/pGyPPzrL8tgcvOxLEatV1QPICghKm13EjEVgkeRftl8X6tqRyFv/9eKutczdD3sklMDOJfivoPD32D46Ww==
-
-esbuild-windows-64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.41.tgz#14886c72949e8630160d2277e21fae59778c2b62"
-  integrity sha512-vLqmKbV8FJ7LFMrT3zEQpojnUUbXyqhRPVGnAYzc0ESY5yAuom4E9tL7KzZ5H8KEuCUf//AvbyxpE+yOcjpyjA==
-
-esbuild-windows-arm64@0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.41.tgz#ad425b8a9fe29bd38b3028af387b5e923e4c54e1"
-  integrity sha512-TOvj7kRTfpH4GPPmblvuMNf8oNJ3y2h7a6HttanVnc3QLMm5bNFYLSo6TShLOn0SbqFWGJwHIhGhw2JK96aVhg==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41"
+  integrity sha512-tz4oM+Zn9CYsvtyicsa/AwzKZKL+ITHWkhiu7x+xF77clh2b4Rm+s6xnOgY/sGDWoFWZmtKsE95hxBPkgQQNnQ==
+
+esbuild-android-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be"
+  integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==
+
+esbuild-android-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771"
+  integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==
+
+esbuild-darwin-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25"
+  integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==
+
+esbuild-darwin-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73"
+  integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==
+
+esbuild-freebsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d"
+  integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==
+
+esbuild-freebsd-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48"
+  integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==
+
+esbuild-linux-32@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5"
+  integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==
+
+esbuild-linux-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652"
+  integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==
+
+esbuild-linux-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b"
+  integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==
+
+esbuild-linux-arm@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59"
+  integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==
+
+esbuild-linux-mips64le@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34"
+  integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==
+
+esbuild-linux-ppc64le@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e"
+  integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==
+
+esbuild-linux-riscv64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8"
+  integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==
+
+esbuild-linux-s390x@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6"
+  integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==
+
+esbuild-netbsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81"
+  integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==
+
+esbuild-openbsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b"
+  integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==
+
+esbuild-sunos-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da"
+  integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==
+
+esbuild-windows-32@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31"
+  integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==
+
+esbuild-windows-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4"
+  integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==
+
+esbuild-windows-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982"
+  integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==
 
 esbuild@^0.14.41:
-  version "0.14.41"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.41.tgz#8e20be02a2efc813b87253e7b197beecced74f7d"
-  integrity sha512-uZl2CH5nwayLPi1Unhfk+vBBjD3FDlYQ+v24qAlj2oZMYQP8pFs1k3DK5ViD+keF3JnuV4K7JtqVvBmTDwVEbA==
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2"
+  integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==
   optionalDependencies:
-    esbuild-android-64 "0.14.41"
-    esbuild-android-arm64 "0.14.41"
-    esbuild-darwin-64 "0.14.41"
-    esbuild-darwin-arm64 "0.14.41"
-    esbuild-freebsd-64 "0.14.41"
-    esbuild-freebsd-arm64 "0.14.41"
-    esbuild-linux-32 "0.14.41"
-    esbuild-linux-64 "0.14.41"
-    esbuild-linux-arm "0.14.41"
-    esbuild-linux-arm64 "0.14.41"
-    esbuild-linux-mips64le "0.14.41"
-    esbuild-linux-ppc64le "0.14.41"
-    esbuild-linux-riscv64 "0.14.41"
-    esbuild-linux-s390x "0.14.41"
-    esbuild-netbsd-64 "0.14.41"
-    esbuild-openbsd-64 "0.14.41"
-    esbuild-sunos-64 "0.14.41"
-    esbuild-windows-32 "0.14.41"
-    esbuild-windows-64 "0.14.41"
-    esbuild-windows-arm64 "0.14.41"
+    "@esbuild/linux-loong64" "0.14.54"
+    esbuild-android-64 "0.14.54"
+    esbuild-android-arm64 "0.14.54"
+    esbuild-darwin-64 "0.14.54"
+    esbuild-darwin-arm64 "0.14.54"
+    esbuild-freebsd-64 "0.14.54"
+    esbuild-freebsd-arm64 "0.14.54"
+    esbuild-linux-32 "0.14.54"
+    esbuild-linux-64 "0.14.54"
+    esbuild-linux-arm "0.14.54"
+    esbuild-linux-arm64 "0.14.54"
+    esbuild-linux-mips64le "0.14.54"
+    esbuild-linux-ppc64le "0.14.54"
+    esbuild-linux-riscv64 "0.14.54"
+    esbuild-linux-s390x "0.14.54"
+    esbuild-netbsd-64 "0.14.54"
+    esbuild-openbsd-64 "0.14.54"
+    esbuild-sunos-64 "0.14.54"
+    esbuild-windows-32 "0.14.54"
+    esbuild-windows-64 "0.14.54"
+    esbuild-windows-arm64 "0.14.54"
+
+flatpickr@^4.6.13:
+  version "4.6.13"
+  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94"
+  integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==
 
 split.js@^1.6.5:
   version "1.6.5"
   resolved "https://registry.yarnpkg.com/split.js/-/split.js-1.6.5.tgz#f7f61da1044c9984cb42947df4de4fadb5a3f300"
   integrity sha512-mPTnGCiS/RiuTNsVhCm9De9cCAUsrNFFviRbADdKiiV+Kk8HKp/0fWu7Kr8pi3/yBmsqLFHuXGT9UUZ+CNLwFw==
+
+stimulus-flatpickr@^3.0.0-0:
+  version "3.0.0-0"
+  resolved "https://registry.yarnpkg.com/stimulus-flatpickr/-/stimulus-flatpickr-3.0.0-0.tgz#af9bfa70bd1b74654312580101387c9d13ee32f2"
+  integrity sha512-TLfxen1OS+3Jy594+VmYkJz/IRaH5wqxxdbVB1aalS1+3EJgy/shqB/Fd4ttKWC8EIOVd8Pzx22oVnjNep3mTA==
+  dependencies:
+    "@hotwired/stimulus" "^3.0.0"
+
+stimulus-rails-nested-form@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/stimulus-rails-nested-form/-/stimulus-rails-nested-form-4.1.0.tgz#bfce185cff908170a4eb9973875b72517c3bc83a"
+  integrity sha512-ORqcTsg3sa4PGFEyUkbvcPG56F4K2fx1qJCUQIgngO1GaW5taKcvDkT0HvdTqtQAFe/1lN4CpJAqoSCt+nYF/Q==