diff --git a/.erb-lint.yml b/.erb-lint.yml
index a85300d2d2..bb8917a318 100644
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -1,4 +1,8 @@
 ---
+glob: "**/*.{html,text,js}{+*,}.erb"
+exclude:
+  - '**/vendor/**/*'
+  - '**/node_modules/**/*'
 linters:
   ErbSafety:
     enabled: true
@@ -11,3 +15,7 @@ linters:
         Enabled: false
       Metrics/LineLength:
         Enabled: false
+      Layout/TrailingEmptyLines:
+        Enabled: false
+      Layout/InitialIndentation:
+        Enabled: false
diff --git a/Dockerfile b/Dockerfile
index b996882dbc..5f45731209 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2.0
+FROM ruby:3.2.1
 
 # set up workdir
 RUN mkdir /circuitverse
diff --git a/Dockerfile.production b/Dockerfile.production
index efb85dde13..1140ab1ad7 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM ruby:3.2.0 as builder
+FROM --platform=$BUILDPLATFORM ruby:3.2.1 as builder
 
 ARG BUILDPLATFORM 
 ENV NODE_ENV=production
@@ -34,7 +34,7 @@ RUN rm -rf node_modules  spec
 
 RUN bundle exec bootsnap precompile --gemfile app/ lib/
 
-FROM --platform=$BUILDPLATFORM ruby:3.2.0-slim as app
+FROM --platform=$BUILDPLATFORM ruby:3.2.1-slim as app
 
 COPY --from=builder /usr/src/app /usr/src/app
 
diff --git a/Gemfile b/Gemfile
index 1135f4f919..71a85467ad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem "view_component"
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem "rails", "~> 7.0"
 # Use Puma as the app server
-gem "puma", "~> 5.6"
+gem "puma", "~> 6.1"
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 6.0"
 gem "terser"
diff --git a/Gemfile.lock b/Gemfile.lock
index 54bbe7f0aa..50d485b2c1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/CircuitVerse/disposable_email.git
-  revision: b47303bcd6c51726d5027e9aa816b3ca1e0b3a3a
+  revision: e90182d085c720bc9361246177fbada38f79179f
   specs:
     disposable_mail (0.1.7)
 
@@ -17,71 +17,71 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4.1)
-      actionpack (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
+    actioncable (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.1)
-      actionpack (= 7.0.4.1)
-      activejob (= 7.0.4.1)
-      activerecord (= 7.0.4.1)
-      activestorage (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
+    actionmailbox (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4.1)
-      actionpack (= 7.0.4.1)
-      actionview (= 7.0.4.1)
-      activejob (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4.1)
-      actionview (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4.1)
-      actionpack (= 7.0.4.1)
-      activerecord (= 7.0.4.1)
-      activestorage (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
+    actiontext (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4.1)
-      activesupport (= 7.0.4.1)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4.1)
-      activesupport (= 7.0.4.1)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
       globalid (>= 0.3.6)
-    activemodel (7.0.4.1)
-      activesupport (= 7.0.4.1)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (7.0.4.1)
-      activemodel (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
-    activestorage (7.0.4.1)
-      actionpack (= 7.0.4.1)
-      activejob (= 7.0.4.1)
-      activerecord (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activestorage (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4.1)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -125,12 +125,11 @@ GEM
     aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.16)
-    better_html (1.0.16)
-      actionview (>= 4.0)
-      activesupport (>= 4.0)
+    better_html (2.0.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
-      html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
     bindex (0.8.1)
@@ -174,7 +173,7 @@ GEM
       rails (>= 6.0)
       sprockets-rails
       will_paginate
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     connection_pool (2.2.5)
     countries (5.3.0)
       unaccent (~> 0.3)
@@ -209,10 +208,9 @@ GEM
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
-    erb_lint (0.1.1)
+    erb_lint (0.4.0)
       activesupport
-      better_html (~> 1.0.7)
-      html_tokenizer
+      better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
       rubocop
@@ -236,22 +234,23 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    flipper (0.24.1)
-    flipper-redis (0.24.0)
-      flipper (~> 0.24.0)
-      redis (>= 3.0, < 5)
-    flipper-ui (0.24.1)
+    flipper (0.28.0)
+      concurrent-ruby (< 2)
+    flipper-redis (0.28.0)
+      flipper (~> 0.28.0)
+      redis (>= 3.0, < 6)
+    flipper-ui (0.28.0)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 0.24.1)
+      flipper (~> 0.28.0)
       rack (>= 1.4, < 3)
-      rack-protection (>= 1.5.3, <= 2.2.0)
+      rack-protection (>= 1.5.3, <= 4.0.0)
       sanitize (< 7)
     font-awesome-sass (5.13.1)
       sassc (>= 1.11)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
     geocoder (1.7.3)
-    globalid (1.0.1)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     hairtrigger (0.2.25)
       activerecord (>= 5.0, < 8)
@@ -262,7 +261,6 @@ GEM
     hirb (0.7.3)
     hiredis (0.6.3)
     hkdf (0.3.0)
-    html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http (4.4.0)
       addressable (~> 2.3)
@@ -327,10 +325,10 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -347,8 +345,8 @@ GEM
     mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.17.0)
+    mini_portile2 (2.8.2)
+    minitest (5.18.0)
     msgpack (1.6.0)
     multi_xml (0.6.0)
     nested_form (0.3.2)
@@ -363,10 +361,8 @@ GEM
       net-protocol
     newrelic_rpm (8.14.0)
     nio4r (2.5.8)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    nokogiri (1.14.2-x64-mingw32)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     noticed (1.6.0)
       http (>= 4.0.0)
@@ -408,7 +404,7 @@ GEM
       omniauth (~> 2.0)
     orm_adapter (0.5.0)
     parallel (1.22.1)
-    parser (3.2.0.0)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     pg (1.4.5)
     pg (1.4.5-x64-mingw32)
@@ -429,32 +425,32 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (5.0.1)
-    puma (5.6.4)
+    puma (6.1.1)
       nio4r (~> 2.0)
     pundit (2.3.0)
       activesupport (>= 3.0.0)
     racc (1.6.2)
-    rack (2.2.6.3)
+    rack (2.2.6.4)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
-    rack-protection (2.2.0)
+    rack-protection (3.0.5)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.4.1)
-      actioncable (= 7.0.4.1)
-      actionmailbox (= 7.0.4.1)
-      actionmailer (= 7.0.4.1)
-      actionpack (= 7.0.4.1)
-      actiontext (= 7.0.4.1)
-      actionview (= 7.0.4.1)
-      activejob (= 7.0.4.1)
-      activemodel (= 7.0.4.1)
-      activerecord (= 7.0.4.1)
-      activestorage (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
+    rails (7.0.4.3)
+      actioncable (= 7.0.4.3)
+      actionmailbox (= 7.0.4.3)
+      actionmailer (= 7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actiontext (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       bundler (>= 1.15.0)
-      railties (= 7.0.4.1)
+      railties (= 7.0.4.3)
     rails-data-migrations (1.2.0)
       rails (>= 4.0.0)
     rails-dom-testing (2.0.3)
@@ -465,7 +461,7 @@ GEM
       activesupport (>= 4.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     rails-i18n (7.0.3)
       i18n (>= 0.7, < 2)
@@ -476,9 +472,9 @@ GEM
       nested_form (~> 0.3)
       rails (>= 6.0, < 8)
       turbo-rails (~> 1.0)
-    railties (7.0.4.1)
-      actionpack (= 7.0.4.1)
-      activesupport (= 7.0.4.1)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -492,7 +488,7 @@ GEM
       json
     redcarpet (3.5.1)
     redis (4.6.0)
-    regexp_parser (2.6.2)
+    regexp_parser (2.7.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -519,18 +515,18 @@ GEM
     rspec-support (3.11.0)
     rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.43.0)
+    rubocop (1.49.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 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.28.0)
+      parser (>= 3.2.1.0)
     rubocop-performance (1.14.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
@@ -542,7 +538,7 @@ GEM
       rubocop (~> 1.19)
     ruby-graphviz (1.2.5)
       rexml
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby-saml (1.14.0)
       nokogiri (>= 1.10.5)
       rexml
@@ -592,7 +588,7 @@ GEM
     simplecov_json_formatter (0.1.4)
     sitemap_generator (6.2.1)
       builder (~> 3.0)
-    smart_properties (1.15.0)
+    smart_properties (1.17.0)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
@@ -625,7 +621,7 @@ GEM
       execjs (>= 0.3.0, < 3)
     thor (1.2.1)
     tilt (2.0.10)
-    timeout (0.3.1)
+    timeout (0.3.2)
     tins (1.32.1)
       sync
     turbo-rails (1.3.2)
@@ -676,7 +672,7 @@ GEM
       will_paginate (>= 3.0.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
@@ -741,7 +737,7 @@ DEPENDENCIES
   pg_search
   premailer-rails (~> 1.11, >= 1.11.1)
   pry-rails
-  puma (~> 5.6)
+  puma (~> 6.1)
   pundit
   rack-attack
   rails (~> 7.0)
diff --git a/app/assets/stylesheets/announcements.scss b/app/assets/stylesheets/announcements.scss
index 296dfc006c..38022f93a5 100644
--- a/app/assets/stylesheets/announcements.scss
+++ b/app/assets/stylesheets/announcements.scss
@@ -1,36 +1,35 @@
 .announcements-content-wrapper {
   align-items: center;
   background: $primary-green;
+  border-radius: .3rem;
   color: $white;
   display: flex;
   flex-wrap: wrap;
-  font-size: 13px;
+  font-size: 1.2rem;
   justify-content: center;
-  min-height: 35px;
-  min-width: 100vw;
+  margin-top: .3rem;
   overflow-wrap: break-word;
-  position: fixed;
-  top: 0;
-  z-index: 1;
 
-  p {
-    margin-bottom: 0;
+  span {
+    display: inline-block;
+    flex: 50%;
+    margin-right: 1rem;
+    margin-top: 1rem;
+    text-align: center;
   }
 
   a {
-    border-bottom: 1px dotted $white;
-    color: $white;
-    font-weight: bold;
-    margin-left: 10px;
-
-    &:hover {
-      text-decoration: none;
-    }
+    background: $secondary-red;
   }
 }
 
 @media(max-width: 992px) {
   .announcements-content-wrapper {
-    font-size: 9px;
+    font-size: 1rem;
+    padding-bottom: .6rem;
+
+    span {
+      flex: 100%;
+    }
   }
 }
diff --git a/app/assets/stylesheets/commontator.scss b/app/assets/stylesheets/commontator.scss
index 94e23a5194..2d7d206573 100644
--- a/app/assets/stylesheets/commontator.scss
+++ b/app/assets/stylesheets/commontator.scss
@@ -18,6 +18,14 @@
   background-color: $card-green;
   margin-top: 15px;
   padding: 10px 20px;
+
+  .body {
+    margin-bottom: 16px;
+
+    p {
+      margin-bottom: 0;
+    }
+  }
 }
 
 .avatar {
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index e412a96eea..23260a5bb9 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -267,12 +267,12 @@
 
 .alert-success {
   margin-top: 10px;
+  padding-top: 1rem; // aligns the alert text
 }
 
 //checkpoints
 .primary-checkpoint {
   background-color: $shadow-grey;
-  bottom: 0;
   display: inline-block;
   height: 25px;
   margin-top: 15px;
@@ -313,11 +313,11 @@
       border: solid $white;
       border-width: 0 3px 3px 0;
       display: block;
-      height: 12px;
-      left: 9px;
-      top: 5px;
+      height: 14px;
+      left: 7px;
+      top: 2px;
       transform: rotate(45deg);
-      width: 8px;
+      width: 9px;
     }
   }
 }
diff --git a/app/assets/stylesheets/groups.scss b/app/assets/stylesheets/groups.scss
index 0ec1d5fc31..88dc6b1f19 100644
--- a/app/assets/stylesheets/groups.scss
+++ b/app/assets/stylesheets/groups.scss
@@ -174,8 +174,9 @@
   background-color: $card-green;
   border: 1px solid $secondary-green;
   display: inline-block;
-  height: 70px;
+  height: 90px;
   margin: 10px;
+  margin-bottom: 20px;
   padding: 15px;
   width: 200px;
   white-space: nowrap;
@@ -183,13 +184,13 @@
 
 .groups-members-card-details {
   padding-right: 0;
-  padding-top: 20px;
+  padding-top: 5px;
   text-align: left;
 
   i {
-    margin-right: 3px;
-    margin-top: 0;
-    padding-bottom: 5px;
+    margin-right: 10px;
+    margin-top: 20px;
+    padding-bottom: 20px;
   }
 }
 
@@ -200,7 +201,7 @@
   
   i {
     margin-right: 15px;
-    padding-bottom: 0;
+    padding-bottom: 15px;
   }
 
   .groups-members-card-name-container {
@@ -218,13 +219,30 @@
   }
 }
 
+.groups-members-card-avatar {
+  img {
+    border-radius: 50%;
+    height: 50px;
+    margin-bottom: 10px;
+    transform: translate(-5px, 5px);
+    transition: all .5s;
+    width: 50px;
+
+    &:hover {
+      transform: scale(2);
+    }
+  }
+}
+
 .groups-members-card-name-container {
   display: inline-block;
-  height: 25px;
-  max-width: 110px;
+  height: 30px;
+  max-width: 92px;
   overflow: hidden;
   padding-top: 1px;
   text-overflow: ellipsis;
+  vertical-align: middle;
+  white-space: nowrap;
 }
 
 .groups-members-card-name {
@@ -265,17 +283,17 @@
 //breakpoints
 @media (max-width: 1200px) {
   .groups-members-scroll-row {
-    max-width: 920px;
+    max-width: 930px;
   }
 
   .groups-members-card {
-    width: 350px;
+    width: 320px;
   }
 }
 
 @media (max-width: 992px) {
   .groups-members-scroll-row {
-    max-width: 610px;
+    max-width: 680px;
   }
 }
 
diff --git a/app/assets/stylesheets/navbar.scss b/app/assets/stylesheets/navbar.scss
index 5a7123ad55..24cbcbbbdd 100644
--- a/app/assets/stylesheets/navbar.scss
+++ b/app/assets/stylesheets/navbar.scss
@@ -234,7 +234,3 @@
     padding-top: 10px;
   }
 }
-
-.navbar-announcement {
-  top: 35px;
-}
diff --git a/app/controllers/api/v1/comments_controller.rb b/app/controllers/api/v1/comments_controller.rb
index 9d6d092784..8b4a66b28b 100644
--- a/app/controllers/api/v1/comments_controller.rb
+++ b/app/controllers/api/v1/comments_controller.rb
@@ -71,7 +71,7 @@ def upvote
 
   # PUT /api/v1/comments/:id/downvote
   def downvote
-    security_transgression_unless @comment.can_be_voted_on_by?(current_user) && \
+    security_transgression_unless @comment.can_be_voted_on_by?(current_user) &&
                                   @comment.thread.config.comment_voting.to_sym == :ld
 
     @comment.downvote_from current_user
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 66b8be04b3..bfa343a5f8 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -22,25 +22,25 @@ def user_access?
   def check_edit_access?
     return false if user.nil? || project.project_submission
 
-    project.author_id == user.id || \
+    project.author_id == user.id ||
       Collaboration.exists?(project_id: project.id, user_id: user.id)
   end
 
   def check_view_access?
-    (project.project_access_type != "Private" \
-    || (!user.nil? && project.author_id == user.id) \
-    || (!user.nil? && !project.assignment_id.nil? \
-      && ((project.assignment.group.primary_mentor_id == user.id) \
-        || project.assignment.group.group_members.exists?(user_id: user.id, mentor: true))) \
-    || (!user.nil? && Collaboration.exists?(project_id: project.id, user_id: user.id)) \
-    || (!user.nil? && user.admin))
+    (project.project_access_type != "Private" ||
+    (!user.nil? && project.author_id == user.id) ||
+    (!user.nil? && !project.assignment_id.nil? &&
+    ((project.assignment.group.primary_mentor_id == user.id) ||
+    project.assignment.group.group_members.exists?(user_id: user.id, mentor: true))) ||
+    (!user.nil? && Collaboration.exists?(project_id: project.id, user_id: user.id)) ||
+    (!user.nil? && user.admin))
   end
 
   def check_direct_view_access?
-    (project.project_access_type == "Public" \
-    || (project.project_submission == false && !user.nil? && project.author_id == user.id) \
-    || (!user.nil? && Collaboration.exists?(project_id: project.id, user_id: user.id)) \
-    || (!user.nil? && user.admin))
+    (project.project_access_type == "Public" ||
+    (project.project_submission == false && !user.nil? && project.author_id == user.id) ||
+    (!user.nil? && Collaboration.exists?(project_id: project.id, user_id: user.id)) ||
+    (!user.nil? && user.admin))
   end
 
   def edit_access?
diff --git a/app/services/i18n_support.rb b/app/services/i18n_support.rb
index 1973fd6e34..615b72093f 100644
--- a/app/services/i18n_support.rb
+++ b/app/services/i18n_support.rb
@@ -5,7 +5,8 @@ def self.locale_names
     [
       %w[English en],
       %w[Hindi hi],
-      %w[Bengali bn]
+      %w[Bengali bn],
+      %w[Marathi mr]
     ]
   end
 end
diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb
index 1d453f6d4e..27dc5ea670 100644
--- a/app/views/about/index.html.erb
+++ b/app/views/about/index.html.erb
@@ -42,7 +42,7 @@
         <% @cores.each do |member| %>
         <div class="team-member-container team-link ">
           <div class="team-underline">
-            <a target="_blank" href="<%= member[:link] %>"><%= image_tag member[:img], :class => "about-contributor-image" %><p class="team-footer "><%= member[:name] %></p></a>
+            <a target="_blank" href="<%= member[:link] %>"><%= image_tag member[:img], class: "about-contributor-image" %><p class="team-footer "><%= member[:name] %></p></a>
           </div>
         </div>
         <% end %>
@@ -62,7 +62,7 @@
         <% @mentors.each do |member| %>
         <div class="team-member-container team-link">
           <div class="team-underline">
-            <a target="_blank" href="<%= member[:link] %>"><%= image_tag member[:img], :class => "about-contributor-image" %><p class="team-footer"><%= member[:name] %></p></a>
+            <a target="_blank" href="<%= member[:link] %>"><%= image_tag member[:img], class: "about-contributor-image" %><p class="team-footer"><%= member[:name] %></p></a>
           </div>
         </div>
         <% end %>
@@ -82,7 +82,7 @@
         <% @alumni.each do |member| %>
         <div class="team-member-container team-link">
           <div class="team-underline">
-            <a target="_blank" href="<%= member[:link] %>"><%= image_tag member[:img], :class => "about-contributor-image " %><p class="team-footer underline"><%= member[:name] %></p></a>
+            <a target="_blank" href="<%= member[:link] %>"><%= image_tag member[:img], class: "about-contributor-image " %><p class="team-footer underline"><%= member[:name] %></p></a>
           </div>
         </div>
         <% end %>
diff --git a/app/views/announcements/_announcement.html.erb b/app/views/announcements/_announcement.html.erb
index 61fb1848c6..670e03032a 100644
--- a/app/views/announcements/_announcement.html.erb
+++ b/app/views/announcements/_announcement.html.erb
@@ -1,9 +1,9 @@
 <% if current_announcement %>
   <% if current_announcement.start_date <= Date.current && current_announcement.end_date >= Date.current %>
     <div class="container announcements-content-wrapper">
-      <%== current_announcement.body %>
+      <span><%== current_announcement.body %></span>
       <% if current_announcement.link? %>
-        <%= link_to t("announcements.learn_more"), current_announcement.link, target: :_blank %>
+        <%= link_to t("announcements.learn_more"), current_announcement.link, target: :_blank, class: "btn primary-delete-button", rel: :noopener %>
       <% end %>
     </div>
   <% end %>
diff --git a/app/views/announcements/_form.html.erb b/app/views/announcements/_form.html.erb
index b3d3f819e3..1655f90efc 100644
--- a/app/views/announcements/_form.html.erb
+++ b/app/views/announcements/_form.html.erb
@@ -1,8 +1,8 @@
-<%= form_with(model: announcement, local: true,  id:"AnnouncementForm")  do |form| %>
+<%= form_with(model: announcement, local: true, id: "AnnouncementForm")  do |form| %>
   <div class="field form-group">
     <h6><%= form.label :body %></h6>
     <div class="input-group">
-      <%= render partial: 'editor/index', locals: {content: announcement.body} %>
+      <%= render partial: "editor/index", locals: { content: announcement.body } %>
     </div>
   </div>
   <div class="field form-group">
diff --git a/app/views/announcements/edit.html.erb b/app/views/announcements/edit.html.erb
index c5eed4cec4..8b1a7f0ec4 100644
--- a/app/views/announcements/edit.html.erb
+++ b/app/views/announcements/edit.html.erb
@@ -3,7 +3,7 @@
     <div class="col-xs col-sm-12 col-md-12 col-lg-12">
       <h1 class="submain-heading"><%= t("announcements.edit_announcement_heading") %></h1> <br>
       <div class="form-container">
-        <%= render 'form',announcement: @announcement %>
+        <%= render "form", announcement: @announcement %>
       </div>
     </div>
   </div>
diff --git a/app/views/announcements/index.html.erb b/app/views/announcements/index.html.erb
index e13b8b5021..0984c83785 100644
--- a/app/views/announcements/index.html.erb
+++ b/app/views/announcements/index.html.erb
@@ -8,7 +8,7 @@
           <div class="mb-3 border border-success">
             <span class="d-flex justify-content-center overflow-hidden"><%== announcement.body %></span>
             <%= link_to t("edit"), edit_announcement_url(announcement), class: "anchor-text" %>
-            <%= link_to t("delete"), announcement_url(announcement),method: :delete, data: {confirm:'Are you sure?'},class: "anchor-text" %>
+            <%= link_to t("delete"), announcement_url(announcement), method: :delete, data: { confirm: "Are you sure?" }, class: "anchor-text" %>
           </div>
         <% end %>
       <% else %>
diff --git a/app/views/announcements/new.html.erb b/app/views/announcements/new.html.erb
index 45876d7c66..bf9fa1dd42 100644
--- a/app/views/announcements/new.html.erb
+++ b/app/views/announcements/new.html.erb
@@ -3,7 +3,7 @@
     <div class="col-xs col-sm-12 col-md-12 col-lg-12">
       <h1 class="submain-heading"><%= t("announcements.new_announcement") %></h1> <br>
       <div class="form-container">
-        <%= render 'form',announcement: Announcement.new %>
+        <%= render "form", announcement: Announcement.new %>
       </div>
     </div>
   </div>
diff --git a/app/views/assignment_mailer/new_assignment_email.html.erb b/app/views/assignment_mailer/new_assignment_email.html.erb
index 5ec638d6a7..45fee1b872 100644
--- a/app/views/assignment_mailer/new_assignment_email.html.erb
+++ b/app/views/assignment_mailer/new_assignment_email.html.erb
@@ -2,9 +2,9 @@
   <h2>Welcome to CircuitVerse, <%= @user.name %></h2>
   <%= inline_svg_tag "SVGs/newAssignment.svg", alt: "New Assignment", class: "mailer-assignment-image" %>
   <p class="mailer-text">
-    A new assignment named <span class="mailer-highlighted-text"><%= @assignment.name %> (<%= @assignment.deadline %>)</span> has been assigned in <span class="mailer-highlighted-text"><%= Group.find_by(id:@assignment.group_id).name %></span>. <br>
-    Assignment is mentored by <span class="mailer-highlighted-text"><%= User.find_by(id:Group.find_by(id:@assignment.group_id).primary_mentor_id).name %></span>
+    A new assignment named <span class="mailer-highlighted-text"><%= @assignment.name %> (<%= @assignment.deadline %>)</span> has been assigned in <span class="mailer-highlighted-text"><%= Group.find_by(id: @assignment.group_id).name %></span>. <br>
+    Assignment is mentored by <span class="mailer-highlighted-text"><%= User.find_by(id: Group.find_by(id: @assignment.group_id).primary_mentor_id).name %></span>
   </p>
-  <a href="<%= group_assignment_url(Group.find_by(id:@assignment.group_id), @assignment) %>" class="mailer-button">View Assignment</a>
+  <a href="<%= group_assignment_url(Group.find_by(id: @assignment.group_id), @assignment) %>" class="mailer-button">View Assignment</a>
   <p class="mailer-text">Keep building!</p>
 </div>
diff --git a/app/views/assignments/_form.html.erb b/app/views/assignments/_form.html.erb
index 839700838f..643710ad65 100644
--- a/app/views/assignments/_form.html.erb
+++ b/app/views/assignments/_form.html.erb
@@ -1,7 +1,7 @@
 <link rel="stylesheet" type="text/css" href="/css/restrictedElements.css">
 <script src="/js/metadata.json"></script>
 
-<%= form_with(model: [group,@assignment], local: true, html: {onsubmit:"beforeSubmit()"}, multipart: true ,id:"assignmentForm", 'data-controller': "assignment") do |form| %>
+<%= form_with(model: [group, @assignment], local: true, html: { onsubmit: "beforeSubmit()" }, multipart: true, id: "assignmentForm", "data-controller": "assignment") do |form| %>
   <% if @assignment.errors.any? %>
     <div id="error-message">
       <ul>
@@ -19,18 +19,18 @@
        <div class="primary-checkpoint"></div>
       </label>
       <div class="lms-integration-message"> <!-- Operated by script -->
-       <p>We will generate the required keys for integration after assignment creation.<a href=<%= lms_integration_tutorial %> target="_blank">Learn how to integrate CircuitVerse assignments with any LMS</a></p>
+       <p>We will generate the required keys for integration after assignment creation.<a href=<%= lms_integration_tutorial %>>Learn how to integrate CircuitVerse assignments with any LMS</a></p>
       </div>
     </div>
   <% end %>
 
   <div id="name-field" class="field form-group">
     <h6><%= form.label :name %></h6>
-    <%= form.text_field :name, id: :assignment_name, class: 'form-control form-input' %>
+    <%= form.text_field :name, id: :assignment_name, class: "form-control form-input" %>
   </div>
   <div id="description" class="field form-group">
     <h6><%= form.label :description %></h6>
-    <%= render :partial => 'editor/index', :locals => {:content => @assignment.description} %>
+    <%= render partial: "editor/index", locals: { content: @assignment.description } %>
   </div>
   <div id="deadline-field" class="field form-group projects-tag-form-group">
     <h6><label for="assignment_deadline"><%= t("assignments.deadline") %></label></h6> (<span id='remaining-time'><b><%= t("assignments.remaining_time_error") %></b></span>)
@@ -45,7 +45,7 @@
           <p>Grading Scale needs to be fixed at 1-100 for passing the grade back to LMS</a></p>
         </div>
       <% end %>
-      <%= form.select :grading_scale, [[t("assignments.form.no_grade"), :no_scale], [t("assignments.form.letter"), :letter], [t("assignments.form.percent"), :percent], [t("assignments.form.custom"), :custom]], {}, class: 'form-control form-input' %>
+      <%= form.select :grading_scale, [[t("assignments.form.no_grade"), :no_scale], [t("assignments.form.letter"), :letter], [t("assignments.form.percent"), :percent], [t("assignments.form.custom"), :custom]], {}, class: "form-control form-input" %>
     <% else %>
       <div class="assignments-noedit-grade-field">
         <p><%= t("assignments.form.cannot_be_edited", graded: AssignmentDecorator.new(@assignment).graded) %></p>
@@ -70,8 +70,8 @@
   </div>
 
   <div class="field form-group">
-    <%= form.submit class: 'btn primary-button' %> &nbsp;
-    <%= link_to t("back"), :back, class: 'anchor-text' %>
+    <%= form.submit class: "btn primary-button" %> &nbsp;
+    <%= link_to t("back"), :back, class: "anchor-text" %>
   </div>
 <% end %>
 
diff --git a/app/views/assignments/edit.html.erb b/app/views/assignments/edit.html.erb
index ff4715f7ec..f26a014dcd 100644
--- a/app/views/assignments/edit.html.erb
+++ b/app/views/assignments/edit.html.erb
@@ -5,13 +5,13 @@
   <div class="row center-row">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <h1 class="submain-heading"><%= t("assignments.edit.edit_assignment") %></h1>
-      <h2 class="submain-heading assignments-submain-heading"><%= t("assignments.group_name",name: @group.name) %></h2> <br>
+      <h2 class="submain-heading assignments-submain-heading"><%= t("assignments.group_name", name: @group.name) %></h2> <br>
     </div>
   </div>
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <div class="form-container">
-        <%= render 'form', assignment: @assignment , group:@group %>
+        <%= render "form", assignment: @assignment, group: @group %>
       </div>
     </div>
   </div>
diff --git a/app/views/assignments/new.html.erb b/app/views/assignments/new.html.erb
index 68eb4a17a3..9eb33df77e 100644
--- a/app/views/assignments/new.html.erb
+++ b/app/views/assignments/new.html.erb
@@ -5,13 +5,13 @@
   <div class="row center-row">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <h1 class="submain-heading"><%= t("assignments.new.new_assignment_heading") %></h1>
-      <h2 class="submain-heading assignments-submain-heading"><%= t("assignments.group_name",name: @group.name) %></h2> <br>
+      <h2 class="submain-heading assignments-submain-heading"><%= t("assignments.group_name", name: @group.name) %></h2> <br>
     </div>
   </div>
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <div class="form-container">
-        <%= render 'form', assignment: @assignment , group:@group %>
+        <%= render "form", assignment: @assignment, group: @group %>
       </div>
     </div>
   </div>
diff --git a/app/views/assignments/show.html.erb b/app/views/assignments/show.html.erb
index 758e7aef4b..1c46e8c525 100644
--- a/app/views/assignments/show.html.erb
+++ b/app/views/assignments/show.html.erb
@@ -43,7 +43,7 @@
         <% end %>
           <% if policy(@assignment).admin_access? && @assignment.status!="closed" %>
             <br>
-            <%= link_to edit_group_assignment_path(@group, @assignment), class:"mini-button groups-reopen-mini-button" do %>
+            <%= link_to edit_group_assignment_path(@group, @assignment), class: "mini-button groups-reopen-mini-button" do %>
               <%= image_tag("SVGs/editGroup.svg", alt: "Edit Assignment") %>
               <span><%= t("edit") %></span>
             <% end %>
@@ -105,21 +105,21 @@
                 <div class="assignments-grading-container">
                   <h5 class="assignments-grading-heading"><%= t("assignments.assignment_data.grades_and_remarks") %></h5>
                   <span id="project-grade-error" class="assignments-error"></span>
-                  <%= form_with(model: Grade.new, multipart: true,id:"assignment-grade-form",url: "/grades") do |form| %>
+                  <%= form_with(model: Grade.new, multipart: true, id: "assignment-grade-form", url: "/grades") do |form| %>
                     <%= form.hidden_field :project_id, id: "assignment-project-id" %>
                     <%= form.hidden_field :assignment_id, value: @assignment.id %>
                     <div class="row">
                       <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
                         <h6><%= t("assignments.assignment_data.grade") %></h6>
                         <% if @assignment.grading_scale == "percent" %>
-                          <%= form.number_field :grade,id: "assignment-grade-grade", min: 0, max: 100, class: "form-control form-input" %>
+                          <%= form.number_field :grade, id: "assignment-grade-grade", min: 0, max: 100, class: "form-control form-input" %>
                         <% elsif @assignment.grading_scale == "letter" || @assignment.grading_scale == "custom" %>
-                          <%= form.text_field :grade,id: "assignment-grade-grade", class: "form-control form-input" %>
+                          <%= form.text_field :grade, id: "assignment-grade-grade", class: "form-control form-input" %>
                         <% end %>
                       </div>
                       <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
                         <h6><%= t("assignments.assignment_data.remarks") %></h6>
-                        <%= form.text_field :remarks,id: "assignment-grade-remarks", class: "form-control form-input" %>
+                        <%= form.text_field :remarks, id: "assignment-grade-remarks", class: "form-control form-input" %>
                       </div>
                     </div>
                     <div class="row">
diff --git a/app/views/circuitverse/contribute.html.erb b/app/views/circuitverse/contribute.html.erb
index 099abf4c7d..f5c875457b 100644
--- a/app/views/circuitverse/contribute.html.erb
+++ b/app/views/circuitverse/contribute.html.erb
@@ -43,7 +43,7 @@
   <div class="row center-row">
     <div class="card-spacing-media col-xs-12 col-sm-12 col-md-6 col-lg-4">
       <div class="card contribute-card">
-        <%= image_tag "SVGs/student.svg", alt: "Student Icon", :class => "card-img-top contribute-card-image" %>
+        <%= image_tag "SVGs/student.svg", alt: "Student Icon", class: "card-img-top contribute-card-image" %>
         <div class="card-body contribute-card-body">
           <h3 class="card-title"><%= t("circuitverse.contribute.student_card.main_heading") %></h3>
           <ul class="card-text">
@@ -56,7 +56,7 @@
     </div>
     <div class="card-spacing-media col-xs-12 col-sm-12 col-md-6 col-lg-4">
       <div class="card contribute-card">
-      <%= image_tag "SVGs/professor.svg", alt: "Professor Icon", :class => "card-img-top contribute-card-image" %>
+      <%= image_tag "SVGs/professor.svg", alt: "Professor Icon", class: "card-img-top contribute-card-image" %>
         <div class="card-body contribute-card-body">
           <h3 class="card-title"><%= t("circuitverse.contribute.teacher_card.main_heading") %></h3>
           <ul class="card-text">
@@ -69,7 +69,7 @@
     </div>
     <div class="card-spacing-media col-xs-12 col-sm-12 col-md-12 col-lg-4">
       <div class="card contribute-card">
-       <%= image_tag "SVGs/coder.svg", alt: "Developer Icon", :class => "card-img-top contribute-card-image" %>
+       <%= image_tag "SVGs/coder.svg", alt: "Developer Icon", class: "card-img-top contribute-card-image" %>
         <div class="card-body contribute-card-body">
           <h3 class="card-title"><%= t("circuitverse.contribute.developer_card.main_heading") %></h3>
           <ul class="card-text">
diff --git a/app/views/circuitverse/examples.html.erb b/app/views/circuitverse/examples.html.erb
index b7d8642a63..2b391ef689 100644
--- a/app/views/circuitverse/examples.html.erb
+++ b/app/views/circuitverse/examples.html.erb
@@ -10,7 +10,7 @@
     <% @examples.each do |example| %>
       <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
         <div class="card circuit-card">
-          <%= image_tag example[:img], alt: example[:name], :class => "card-img-top circuit-card-image examples-circuit-card-image" %>
+          <%= image_tag example[:img], alt: example[:name], class: "card-img-top circuit-card-image examples-circuit-card-image" %>
           <div class="card-footer circuit-card-footer">
             <div class="circuit-card-name">
               <p><%= example[:name] %></p>
diff --git a/app/views/circuitverse/index.html.erb b/app/views/circuitverse/index.html.erb
index d4ba62e296..af158923a3 100644
--- a/app/views/circuitverse/index.html.erb
+++ b/app/views/circuitverse/index.html.erb
@@ -7,21 +7,21 @@
 <% content_for :title, t("circuitverse.index.title") %>
 
 <% set_meta_tags twitter: {
-  card: "summary_large_image",
-  title: yield(:title),
-  description: Rails.configuration.site_description,
-  image: {
-    src: "#{Rails.configuration.site_url}img/circuitverseBanner2.png"
-  }
-} %>
+     card: "summary_large_image",
+     title: yield(:title),
+     description: Rails.configuration.site_description,
+     image: {
+       src: "#{Rails.configuration.site_url}img/circuitverseBanner2.png"
+     }
+   } %>
 
 <% set_meta_tags og: {
-  title: yield(:title),
-  image: "#{Rails.configuration.site_url}img/circuitverseBanner2.png",
-  description: Rails.configuration.site_description,
-  type: "article",
-  site_name: Rails.configuration.site_name
-} %>
+     title: yield(:title),
+     image: "#{Rails.configuration.site_url}img/circuitverseBanner2.png",
+     description: Rails.configuration.site_description,
+     type: "article",
+     site_name: Rails.configuration.site_name
+   } %>
 
     <% if notice %>
     <div class="row" id='alertdiv'>
@@ -31,6 +31,7 @@
       </div>
     </div>
     <% end %>
+    <%= render "announcements/announcement" %>
     <div class="container">
       <div class="row center-row">
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
@@ -44,7 +45,7 @@
           </div>
         </div>
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-          <%= image_tag "homepage/new_homepage_sketch.png", alt: "HomepageSketch", :class => "home-image-cover" %>
+          <%= image_tag "homepage/new_homepage_sketch.png", alt: "HomepageSketch", class: "home-image-cover" %>
         </div>
       </div>
       <div class="row">
@@ -62,7 +63,7 @@
       <div class="row center-row justify-content-center">
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
           <div class="card home-feature-card">
-            <%= image_tag "homepage/export-hd.png", alt: "Export HD", :class => "card-img-top" %>
+            <%= image_tag "homepage/export-hd.png", alt: "Export HD", class: "card-img-top" %>
             <div class="card-body">
               <h5 class="card-title"><%= t("circuitverse.index.features.item1_heading") %></h5>
               <p class="card-text"><%= t("circuitverse.index.features.item1_text") %></p>
@@ -71,7 +72,7 @@
         </div>
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
           <div class="card home-feature-card">
-            <%= image_tag "homepage/combinations analysis.png", alt: "Combinational Analysis", :class => "card-img-top" %>
+            <%= image_tag "homepage/combinations analysis.png", alt: "Combinational Analysis", class: "card-img-top" %>
             <div class="card-body">
               <h5 class="card-title"><%= t("circuitverse.index.features.item2_heading") %></h5>
               <p class="card-text"><%= t("circuitverse.index.features.item2_text") %></p>
@@ -80,7 +81,7 @@
         </div>
         <div class="col-xs-12 col-s-12 col-md-6 col-lg-4">
           <div class="card home-feature-card">
-            <%= image_tag "homepage/embed.png", alt: "Embed", :class => "card-img-top" %>
+            <%= image_tag "homepage/embed.png", alt: "Embed", class: "card-img-top" %>
             <div class="card-body">
               <h5 class="card-title"><%= t("circuitverse.index.features.item3_heading") %></h5>
               <p class="card-text"><%= t("circuitverse.index.features.item3_text") %></p>
@@ -89,7 +90,7 @@
         </div>
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
           <div class="card home-feature-card">
-            <%= image_tag "homepage/sub-circuit.png", alt: "Sub Circuit", :class => "card-img-top" %>
+            <%= image_tag "homepage/sub-circuit.png", alt: "Sub Circuit", class: "card-img-top" %>
             <div class="card-body">
               <h5 class="card-title"><%= t("circuitverse.index.features.item4_heading") %></h5>
               <p class="card-text"><%= t("circuitverse.index.features.item4_text") %></p>
@@ -98,7 +99,7 @@
         </div>
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
           <div class="card home-feature-card">
-            <%= image_tag "homepage/multi-bit-bus.png", alt: "Multi Bit Bus", :class => "card-img-top" %>
+            <%= image_tag "homepage/multi-bit-bus.png", alt: "Multi Bit Bus", class: "card-img-top" %>
             <div class="card-body">
               <h5 class="card-title"><%= t("circuitverse.index.features.item5_heading") %></h5>
               <p class="card-text"><%= t("circuitverse.index.features.item5_text") %></p>
@@ -117,7 +118,7 @@
       <div class="row center-row justify-content-center">
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
           <div class="card circuit-card">
-            <%= image_tag "homepage/rippleCarry.jpg", alt: "Ripple Carry", :class => "card-img-top circuit-card-image examples-circuit-card-image" %>
+            <%= image_tag "homepage/rippleCarry.jpg", alt: "Ripple Carry", class: "card-img-top circuit-card-image examples-circuit-card-image" %>
             <div class="card-footer circuit-card-footer">
               <div class="circuit-card-name">
                 <p><%= t("circuitverse.index.featured_examples.circuit1_text") %></p>
@@ -129,7 +130,7 @@
         </div>
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
           <div class="card circuit-card">
-            <%= image_tag "homepage/sap.jpg", alt: "SAP-1", :class => "card-img-top circuit-card-image examples-circuit-card-image" %>
+            <%= image_tag "homepage/sap.jpg", alt: "SAP-1", class: "card-img-top circuit-card-image examples-circuit-card-image" %>
             <div class="card-footer circuit-card-footer">
               <div class="circuit-card-name">
                 <p><%= t("circuitverse.index.featured_examples.circuit2_text") %></p>
@@ -141,7 +142,7 @@
         </div>
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
           <div class="card circuit-card">
-            <%= image_tag "homepage/fullAdder.jpg", alt: "Full Adder", class: "card-img-top circuit-card-image examples-circuit-card-image", height: '180', width: '288' %>
+            <%= image_tag "homepage/fullAdder.jpg", alt: "Full Adder", class: "card-img-top circuit-card-image examples-circuit-card-image", height: "180", width: "288" %>
             <div class="card-footer circuit-card-footer">
               <div class="circuit-card-name">
                 <p><%= t("circuitverse.index.featured_examples.circuit3_text") %></p>
@@ -166,12 +167,12 @@
             <p><%= t("circuitverse.index.editor_picks.main_description") %></p>
           </div>
         </div>
-        <% cache :featured_circuits, expires_in: 6.hours do%>
+        <% cache :featured_circuits, expires_in: 6.hours do %>
           <div class="row center-row justify-content-center">
             <% @featured_circuits.each do |circuit| %>
               <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
                 <div class="card circuit-card">
-                  <%= image_tag circuit.image_preview.url, alt: circuit.name, class: "card-img-top circuit-card-image", height: '180', width: '288' %>
+                  <%= image_tag circuit.image_preview.url, alt: circuit.name, class: "card-img-top circuit-card-image", height: "180", width: "288" %>
                   <div class="card-footer circuit-card-footer">
                     <div class="circuit-card-name">
                       <p><%= circuit.name %></p>
@@ -191,7 +192,7 @@
         </div>
       </div>
     </div>
-    <% cache "recent-projects-#{params[:page]}", expires_in: 10.minutes do%>
+    <% cache "recent-projects-#{params[:page]}", expires_in: 10.minutes do %>
       <div class="container" id="recent">
         <div class="row center-row home-circuit-card-row">
           <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
@@ -203,7 +204,7 @@
           <% @projects.each do |project| %>
             <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
               <div class="card circuit-card">
-                <%= image_tag project.image_preview.url, alt: project.name, :class => "card-img-top circuit-card-image" %>
+                <%= image_tag project.image_preview.url, alt: project.name, class: "card-img-top circuit-card-image" %>
                 <div class="card-footer circuit-card-footer">
                   <div class="circuit-card-name">
                     <p><%= project.name %></p>
diff --git a/app/views/circuitverse/tos.html.erb b/app/views/circuitverse/tos.html.erb
index 6cce591940..e6250d64ee 100644
--- a/app/views/circuitverse/tos.html.erb
+++ b/app/views/circuitverse/tos.html.erb
@@ -148,4 +148,4 @@
     <p><%= t("circuitverse.tos.no_waiver.description1") %></p>
   </section>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/circuitverse_assets/_search_bar.html.erb b/app/views/circuitverse_assets/_search_bar.html.erb
index a3c778b35f..d199c9e7ba 100644
--- a/app/views/circuitverse_assets/_search_bar.html.erb
+++ b/app/views/circuitverse_assets/_search_bar.html.erb
@@ -1,8 +1,8 @@
 <div class="container navbar-search-container">
   <div class="row center-row">
-  <%= form_tag("/search", method: "get", id: 'search-box', class: 'navbar-search-bar-form') do %>
-    <%= select_tag :resource , options_for_select([ "Users", "Projects" ],selected: params[:resource]), class: "navbar-search-bar-select", id: "search_type" %>
-    <%= text_field_tag :q,params[:q], placeholder: "Search for projects or users", autocomplete:"off", class: "form-control form-input navbar-search-bar-input" %>
+  <%= form_tag("/search", method: "get", id: "search-box", class: "navbar-search-bar-form") do %>
+    <%= select_tag :resource, options_for_select(%w[Users Projects], selected: params[:resource]), class: "navbar-search-bar-select", id: "search_type" %>
+    <%= text_field_tag :q, params[:q], placeholder: "Search for projects or users", autocomplete: "off", class: "form-control form-input navbar-search-bar-input" %>
     <button class="btn primary-button navbar-search-bar-button" type="submit" name="button" value="Submit">Search</button>
   <% end %>
   </div>
diff --git a/app/views/commontator/comments/_form.html.erb b/app/views/commontator/comments/_form.html.erb
index 8cd76893ae..b048d8e2e0 100644
--- a/app/views/commontator/comments/_form.html.erb
+++ b/app/views/commontator/comments/_form.html.erb
@@ -28,7 +28,7 @@
 
   <% unless comment.parent.nil? %>
     <div class="replying">
-      <%= t('commontator.comment.status.replying',
+      <%= t("commontator.comment.status.replying",
             creator_name: Commontator.commontator_name(comment.parent.creator)) %>
     </div>
   <% end %>
diff --git a/app/views/commontator/comments/_show.html.erb b/app/views/commontator/comments/_show.html.erb
index 34c70f23c0..c04ee42e6d 100644
--- a/app/views/commontator/comments/_show.html.erb
+++ b/app/views/commontator/comments/_show.html.erb
@@ -87,7 +87,6 @@
   </div>
 </div>
 
-
 <div id="commontator-comment-<%= comment.id %>-children" class="children">
   <% if thread.config.comment_order == :l %>
     <div id="commontator-comment-<%= comment.id %>-reply" class="reply"></div>
diff --git a/app/views/commontator/comments/_show.js.erb b/app/views/commontator/comments/_show.js.erb
index 2dad4f0846..39684c16df 100644
--- a/app/views/commontator/comments/_show.js.erb
+++ b/app/views/commontator/comments/_show.js.erb
@@ -6,7 +6,6 @@
   # page
   # show_all
 %>
-
 $("#commontator-comment-<%= comment.id %>").html("<%= escape_javascript(
   render partial: 'commontator/comments/show', formats: [ :html ], locals: {
     user: user, thread: thread, comment: comment, page: page, show_all: show_all
diff --git a/app/views/commontator/comments/_votes.html.erb b/app/views/commontator/comments/_votes.html.erb
index 631f74098b..445fc9fa8a 100644
--- a/app/views/commontator/comments/_votes.html.erb
+++ b/app/views/commontator/comments/_votes.html.erb
@@ -28,8 +28,7 @@
             remote: true do %>
         <%= image_submit_tag "commontator/upvote_active.png",
               onmouseover: "this.src='#{image_path("commontator/upvote.png")}'",
-              onmouseout: "this.src='#{image_path("commontator/upvote_active.png")}'"
-        %>
+              onmouseout: "this.src='#{image_path("commontator/upvote_active.png")}'" %>
       <% end %>
     <% else %>
       <div title="You can't vote on your own comment">
@@ -58,10 +57,9 @@
       <%= form_tag commontator.unvote_comment_path(comment),
             method: :put,
             remote: true do %>
-        <%= image_submit_tag "commontator/downvote_active.png",
-              onmouseover: "this.src='#{image_path("commontator/downvote.png")}'",
-              onmouseout: "this.src='#{image_path("commontator/downvote_active.png")}'"
-        %>
+      <%= image_submit_tag "commontator/downvote_active.png",
+        onmouseover: "this.src='#{image_path("commontator/downvote.png")}'",
+        onmouseout: "this.src='#{image_path("commontator/downvote_active.png")}'" %>
       <% end %>
     <% else %>
     <div title="You can't vote on your own comment">
diff --git a/app/views/commontator/threads/_show.js.erb b/app/views/commontator/threads/_show.js.erb
index 8c94ea3d78..777c19d0ca 100644
--- a/app/views/commontator/threads/_show.js.erb
+++ b/app/views/commontator/threads/_show.js.erb
@@ -6,7 +6,6 @@
   show_all
 %>
 
-
 $("#commontator-thread-<%= thread.id %>").html("<%= escape_javascript(
   render partial: 'commontator/threads/show', formats: [ :html ], locals: {
     user: user, thread: thread, page: page, show_all: show_all
diff --git a/app/views/custom_mails/_form.html.erb b/app/views/custom_mails/_form.html.erb
index ac2755c8eb..4c42add94b 100644
--- a/app/views/custom_mails/_form.html.erb
+++ b/app/views/custom_mails/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(model: custom_mail, local: true, multipart: true, id:"mailsForm") do |form| %>
+<%= form_with(model: custom_mail, local: true, multipart: true, id: "mailsForm") do |form| %>
   <div class="field form-group">
     <h6><%= form.label :subject %></h6>
     <div class="input-group">
@@ -8,7 +8,7 @@
   <div class="field form-group" id="description">
     <h6><%= form.label :content %></h6>
     <div class="input-group">
-      <%= render :partial => 'editor/index', :locals => {:content => custom_mail.content} %>
+      <%= render partial: "editor/index", locals: { content: custom_mail.content } %>
     </div>
   </div>
   <div onclick="before_submit()">
diff --git a/app/views/custom_mails/edit.html.erb b/app/views/custom_mails/edit.html.erb
index 43489b8415..ad670f58b0 100644
--- a/app/views/custom_mails/edit.html.erb
+++ b/app/views/custom_mails/edit.html.erb
@@ -3,7 +3,7 @@
     <div class="col-xs col-sm-12 col-md-12 col-lg-12">
       <h1 class="submain-heading">Edit Custom Mail</h1> <br>
       <div class="form-container">
-        <%= render 'form', custom_mail: @mail %>
+        <%= render "form", custom_mail: @mail %>
       </div>
     </div>
   </div>
diff --git a/app/views/custom_mails/index.html.erb b/app/views/custom_mails/index.html.erb
index e5a6ee5bd5..3d0ff36b2a 100644
--- a/app/views/custom_mails/index.html.erb
+++ b/app/views/custom_mails/index.html.erb
@@ -17,8 +17,8 @@
               <tr>
                 <td><%= mail.subject %></td>
                 <td><%= mail.sent ? "Yes" : "No" %></td>
-                <td><%= link_to 'Show', mail, class: "anchor-text" %></td>
-                <td><%= link_to 'Edit', edit_custom_mail_url(mail), class: "anchor-text" %></td>
+                <td><%= link_to "Show", mail, class: "anchor-text" %></td>
+                <td><%= link_to "Edit", edit_custom_mail_url(mail), class: "anchor-text" %></td>
               </tr>
             <% end %>
           </tbody>
diff --git a/app/views/custom_mails/new.html.erb b/app/views/custom_mails/new.html.erb
index 0fa36d4d1b..f0e553bcc3 100644
--- a/app/views/custom_mails/new.html.erb
+++ b/app/views/custom_mails/new.html.erb
@@ -3,7 +3,7 @@
     <div class="col-xs col-sm-12 col-md-12 col-lg-12">
       <h1 class="submain-heading">New Custom Mail</h1> <br>
       <div class="form-container">
-        <%= render 'form', custom_mail: CustomMail.new %>
+        <%= render "form", custom_mail: CustomMail.new %>
       </div>
     </div>
   </div>
diff --git a/app/views/custom_mails/show.html.erb b/app/views/custom_mails/show.html.erb
index 2c4e0f2bea..64475b4285 100644
--- a/app/views/custom_mails/show.html.erb
+++ b/app/views/custom_mails/show.html.erb
@@ -7,9 +7,9 @@
   </div>
   <div class="row center-row">
     <div class="col-xs col-sm col-md col-lg">
-      <%= link_to 'Edit', edit_custom_mail_path(@mail), class: "btn primary-button" %>
-      <%= link_to 'Send', send_custom_mail_path(@mail), class: "btn primary-button" %>
-      <%= link_to 'Send to self', send_custom_mail_self_path(@mail), class: "btn primary-button" %>
+      <%= link_to "Edit", edit_custom_mail_path(@mail), class: "btn primary-button" %>
+      <%= link_to "Send", send_custom_mail_path(@mail), class: "btn primary-button" %>
+      <%= link_to "Send to self", send_custom_mail_self_path(@mail), class: "btn primary-button" %>
     </div>
   </div>
   <div class="row center-row">
diff --git a/app/views/errors/internal_error.html.erb b/app/views/errors/internal_error.html.erb
index 6aa17841f1..f31ef12f22 100644
--- a/app/views/errors/internal_error.html.erb
+++ b/app/views/errors/internal_error.html.erb
@@ -2,7 +2,7 @@
 
 <div class="container text-center">
   <div class="row row-errorpage">
-	  <div class="col-xs col-sm col-md col-lg">
+    <div class="col-xs col-sm col-md col-lg">
       <div class="error-code bold pt-5">500</div>
     </div>
   </div>
diff --git a/app/views/featured_circuits/index.html.erb b/app/views/featured_circuits/index.html.erb
index 9067632084..35eb56356b 100644
--- a/app/views/featured_circuits/index.html.erb
+++ b/app/views/featured_circuits/index.html.erb
@@ -11,7 +11,7 @@
     <% @projects.each do |project| %>
       <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
         <div class="card circuit-card">
-          <%= image_tag project.image_preview.url, alt: project.name, :class => "card-img-top circuit-card-image" %>
+          <%= image_tag project.image_preview.url, alt: project.name, class: "card-img-top circuit-card-image" %>
           <div class="card-footer circuit-card-footer">
             <div class="circuit-card-name">
               <p><%= project.name %></p>
diff --git a/app/views/groups/_add_member_modal.html.erb b/app/views/groups/_add_member_modal.html.erb
index f2fea91bbe..c25ec750e2 100644
--- a/app/views/groups/_add_member_modal.html.erb
+++ b/app/views/groups/_add_member_modal.html.erb
@@ -25,16 +25,16 @@
           </div>
           <div class="form-group">
             <%= form.label :emails %>
-            <%= form.select :emails,[ ],{},{ class: 'form-select', multiple: true } %>
+            <%= form.select :emails, [], {}, { class: "form-select", multiple: true } %>
           </div>
           <div class="modal-footer">
-            <%= form.submit  class: 'add-members-button btn primary-button' %>
+            <%= form.submit class: "add-members-button btn primary-button" %>
           </div>
         <% end %>
       </div>
       <div class="mx-auto text-center p-3">
         <p><%= t("groups.use_alternative") %></p>
-        <%= button_to generate_token_group_path,{remote: true,method: :put,class: 'btn primary-button', 'data-toggle':'collapse', 'href':'#collapseExample', 'aria-expanded':'false', 'aria-controls':'collapseExample'} do %>
+        <%= button_to generate_token_group_path, { remote: true, method: :put, class: "btn primary-button", "data-toggle": "collapse", href: "#collapseExample", "aria-expanded": "false", "aria-controls": "collapseExample" } do %>
           <i class="fas fa-external-link-alt"></i>
           <span><%= t("groups.invite_link_btn") %></span>
         <% end %>
diff --git a/app/views/groups/_add_mentor_modal.html.erb b/app/views/groups/_add_mentor_modal.html.erb
index 8fecb36ee7..8af1180a10 100644
--- a/app/views/groups/_add_mentor_modal.html.erb
+++ b/app/views/groups/_add_mentor_modal.html.erb
@@ -26,10 +26,10 @@
           </div>
           <div class="form-group">
             <%= form.label :emails %>
-            <%= form.select :emails,[ ],{},{ class:'form-select', id:'group_mentor_emails', multiple: true } %>
+            <%= form.select :emails, [], {}, { class: "form-select", id: "group_mentor_emails", multiple: true } %>
           </div>
           <div class="modal-footer">
-            <%= form.submit "Add mentors", class: 'btn primary-button', id: 'add-mentor-button' %>
+            <%= form.submit "Add mentors", class: "btn primary-button", id: "add-mentor-button" %>
           </div>
         <% end %>
       </div>
diff --git a/app/views/groups/_delete_assignment_confirmation_modal.html.erb b/app/views/groups/_delete_assignment_confirmation_modal.html.erb
index 15831a3305..c1f2c2e834 100644
--- a/app/views/groups/_delete_assignment_confirmation_modal.html.erb
+++ b/app/views/groups/_delete_assignment_confirmation_modal.html.erb
@@ -9,7 +9,7 @@
         <p><%= t("groups.remove_assignment_message") %></p>
       </div>
       <div class="modal-footer">
-        <%= link_to '#', method: :delete, class: "btn primary-delete-button", id: "groups-assignment-delete-button" do %>
+        <%= link_to "#", method: :delete, class: "btn primary-delete-button", id: "groups-assignment-delete-button" do %>
           <%= t("delete") %>
         <% end %>
       </div>
diff --git a/app/views/groups/_delete_member_confirmation_modal.html.erb b/app/views/groups/_delete_member_confirmation_modal.html.erb
index d5d12b9e44..1a1d1c8b28 100644
--- a/app/views/groups/_delete_member_confirmation_modal.html.erb
+++ b/app/views/groups/_delete_member_confirmation_modal.html.erb
@@ -9,7 +9,7 @@
         <p><%= t("groups.remove_member_message") %></p>
       </div>
       <div class="modal-footer">
-        <%= link_to '#', method: :delete, class: "btn primary-delete-button", id: "groups-member-delete-button" do %>
+        <%= link_to "#", method: :delete, class: "btn primary-delete-button", id: "groups-member-delete-button" do %>
           <%= t("delete") %>
         <% end %>
       </div>
diff --git a/app/views/groups/_form.html.erb b/app/views/groups/_form.html.erb
index 204af80268..03d9fef9fd 100644
--- a/app/views/groups/_form.html.erb
+++ b/app/views/groups/_form.html.erb
@@ -12,12 +12,12 @@
     <div class="field form-group">
       <h5><%= form.label :name %></h5>
       <div class="input-group groups-input-group">
-        <%= form.text_field :name, id: :group_name, class: 'form-control form-input', autofocus: true %>
+        <%= form.text_field :name, id: :group_name, class: "form-control form-input", autofocus: true %>
       </div>
     </div>
   </div>
   <div class="groups-form-text-container">
-    <%= form.submit class: 'btn primary-button groups-form-primary-button' %>
-    <%= link_to t("back"), :back, class: 'groups-form-anchor-text anchor-text' %>
+    <%= form.submit class: "btn primary-button groups-form-primary-button" %>
+    <%= link_to t("back"), :back, class: "groups-form-anchor-text anchor-text" %>
   </div>
 <% end %>
diff --git a/app/views/groups/_group_members.html.erb b/app/views/groups/_group_members.html.erb
index 1d2739cfbe..dad635560b 100644
--- a/app/views/groups/_group_members.html.erb
+++ b/app/views/groups/_group_members.html.erb
@@ -3,23 +3,28 @@
     <div class="<%= membersCardViewer(group) %>">
       <div class="row">
         <div class="<%= membersCardViewerDetail(group) %>">
-          <i class="fa fa-user"></i>
+          <span class="groups-members-card-avatar">
+          <% if member.user.profile_picture.present? %>
+          <%= link_to image_tag(member.user.profile_picture.url, alt: member.user.name, title: "#{member.user.name}\n#{member.user.email}"), user_path(member.user.id) %>          <% else %>
+          <i class="fa fa-user default-profile-icon"></i>
+          <% end %>
+          </span>
           <div class="groups-members-card-name-container">
             <span class="tooltiptext"><%= member.user.name %></span>
-            <%= link_to member.user.name, member.user, class: "groups-members-card-name" %>
+            <%= link_to member.user.name, member.user, class: "groups-members-card-name", title: "view profile of #{member.user.name}" %>
           </div>
           <% if policy(group).admin_access? %>
-            <p class="groups-members-card-email"><%= member.user.email %></p>
+            <p class="groups-members-card-email" title="<%= member.user.email %>"><%= member.user.email %></p>
           <% end %>
         </div>
         <% if policy(group).admin_access? %>
           <div class="group-member-button-container">
             <div class="groups-mentor-card-mini-buttons">
-              <%= link_to '#', data: {toggle: "modal", target: "#deletememberModal", currentgroupmember: GroupMember.find_by(user_id:member.user.id,group_id:group.id).id}, class:"mini-button groups-delete-mini-button" do %>
+              <%= link_to "#", data: { toggle: "modal", target: "#deletememberModal", currentgroupmember: GroupMember.find_by(user_id: member.user.id, group_id: group.id).id }, class: "mini-button groups-delete-mini-button" do %>
                 <%= image_tag("SVGs/deleteGroup.svg", alt: "Remove Member") %>
                 <span><%= t("remove") %></span>
               <% end %>
-              <%= link_to '#', data: {toggle: "modal", target: "#promote-member-modal", currentgroupmember: GroupMember.find_by(user_id:member.user.id,group_id:group.id).id}, class:"mini-button groups-reopen-mini-button" do %>
+              <%= link_to "#", data: { toggle: "modal", target: "#promote-member-modal", currentgroupmember: GroupMember.find_by(user_id: member.user.id, group_id: group.id).id }, class: "mini-button groups-reopen-mini-button" do %>
                 <%= image_tag("SVGs/editGroup.svg", alt: "Make Member") %>
                 <span><%= t("groups.make_mentor") %></span>
               <% end %>
diff --git a/app/views/groups/_group_mentors.html.erb b/app/views/groups/_group_mentors.html.erb
index cd3e3e90cd..ad624fa7b1 100644
--- a/app/views/groups/_group_mentors.html.erb
+++ b/app/views/groups/_group_mentors.html.erb
@@ -3,23 +3,28 @@
     <div class="<%= membersCardViewer(group) %>">
       <div class="row">
         <div class="<%= membersCardViewerDetail(group) %>">
-          <i class="fa fa-user"></i>
+        <span class="groups-members-card-avatar">
+        <% if member.user.profile_picture.present? %>
+        <%= link_to image_tag(member.user.profile_picture.url, alt: member.user.name, title: "#{member.user.name}\n#{member.user.email}"), user_path(member.user.id) %>        <% else %>
+        <i class="fa fa-user"></i>
+        <% end %>
+        </span>
           <div class="groups-members-card-name-container">
             <span class="tooltiptext"><%= member.user.name %></span>
-            <%= link_to member.user.name, member.user, class: "groups-members-card-name" %>
+            <%= link_to member.user.name, member.user, class: "groups-members-card-name", title: "view profile of #{member.user.name}" %>
           </div>
           <% if policy(group).admin_access? %>
-            <p class="groups-members-card-email"><%= member.user.email %></p>
+            <p class="groups-members-card-email" title="<%= member.user.email %>"><%= member.user.email %></p>
           <% end %>
         </div>
         <% if policy(group).admin_access? %>
           <div class="group-member-button-container">
             <div class="groups-mentor-card-mini-buttons">
-              <%= link_to '#', data: {toggle: "modal", target: "#deletememberModal", currentgroupmember: GroupMember.find_by(user_id:member.user.id,group_id:group.id).id}, class:"mini-button groups-delete-mini-button" do %>
+              <%= link_to "#", data: { toggle: "modal", target: "#deletememberModal", currentgroupmember: GroupMember.find_by(user_id: member.user.id, group_id: group.id).id }, class: "mini-button groups-delete-mini-button" do %>
                 <%= image_tag("SVGs/deleteGroup.svg", alt: "Remove Member") %>
                 <span><%= t("remove") %></span>
               <% end %>
-              <%= link_to '#', data: {toggle: "modal", target: "#demote-member-modal", currentgroupmember: GroupMember.find_by(user_id:member.user.id,group_id:group.id).id}, class:"mini-button groups-reopen-mini-button" do %>
+              <%= link_to "#", data: { toggle: "modal", target: "#demote-member-modal", currentgroupmember: GroupMember.find_by(user_id: member.user.id, group_id: group.id).id }, class: "mini-button groups-reopen-mini-button" do %>
                 <%= image_tag("SVGs/editGroup.svg", alt: "Make mentor") %>
                 <span><%= t("groups.make_member") %></span>
               <% end %>
diff --git a/app/views/groups/_lms_credentials_modal.html.erb b/app/views/groups/_lms_credentials_modal.html.erb
index bd52448666..dbb0a9a066 100644
--- a/app/views/groups/_lms_credentials_modal.html.erb
+++ b/app/views/groups/_lms_credentials_modal.html.erb
@@ -10,7 +10,7 @@
         <br>
         <div class="groups-lms-modal">
           <strong>Tool Url:</strong>
-          <p id="toolurl" class="link-text"><%= URI.join request.original_url, '/lti/launch' %></p>
+          <p id="toolurl" class="link-text"><%= URI.join request.original_url, "/lti/launch" %></p>
           <a class="btn primary-button groups-copy-lms-credentials-button" onclick="return copyToClipboard('#toolurl');">
             <%= image_tag("SVGs/createCopy.svg", alt: "Create Copy") %>
           </a>
@@ -31,7 +31,7 @@
         </div>
         <br>
         <div>
-          <a href=<%= lms_integration_tutorial %> target="_blank">Learn how to integrate CircuitVerse assignments with any LMS</a>
+          <a href=<%= lms_integration_tutorial %>>Learn how to integrate CircuitVerse assignments with any LMS</a>
         </div>
       </div>
     </div>
diff --git a/app/views/groups/_promote_member_confirmation_modal.html.erb b/app/views/groups/_promote_member_confirmation_modal.html.erb
index f679aa3dcf..2dc2621376 100644
--- a/app/views/groups/_promote_member_confirmation_modal.html.erb
+++ b/app/views/groups/_promote_member_confirmation_modal.html.erb
@@ -10,7 +10,7 @@
         <%= t("groups.add_mentor_description_html") %>
       </div>
       <div class="modal-footer">
-        <%= button_to "#",params: { group_member: {mentor: true} }, method: :patch, class: "btn primary-button", id: "groups-member-promote-button" do %>
+        <%= button_to "#", params: { group_member: { mentor: true } }, method: :patch, class: "btn primary-button", id: "groups-member-promote-button" do %>
           <%= t("groups.make_mentor") %>
         <% end %>
       </div>
@@ -30,11 +30,10 @@
         <%= t("groups.add_mentor_description_html") %>
       </div>
       <div class="modal-footer">
-        <%= button_to "#",params: { group_member: {mentor: false} }, method: :patch, class: "btn primary-button", id: "groups-member-demote-button" do %>
+        <%= button_to "#", params: { group_member: { mentor: false } }, method: :patch, class: "btn primary-button", id: "groups-member-demote-button" do %>
           <%= t("groups.make_member") %>
         <% end %>
       </div>
     </div>
   </div>
 </div>
-
diff --git a/app/views/groups/edit.html.erb b/app/views/groups/edit.html.erb
index cb98552d18..02002d5cd6 100644
--- a/app/views/groups/edit.html.erb
+++ b/app/views/groups/edit.html.erb
@@ -8,12 +8,12 @@
   </div>
   <div class="row center-row">
     <div class="col-xs-12 col-sm-12 col-md-5 col-lg-6">
-      <%= image_tag "PNGs/editGroupName.png", alt: "Group Sketch", :class => "groups-center-image center-image" %>
+      <%= image_tag "PNGs/editGroupName.png", alt: "Group Sketch", class: "groups-center-image center-image" %>
     </div>
     <div class="col-xs-12 col-sm-12 col-md-7 col-lg-6">
       <div class="container">
         <div class="center-row groups-background-card">
-          <%= render 'form', group: @group %>
+          <%= render "form", group: @group %>
         </div>
       </div>
     </div>
diff --git a/app/views/groups/new.html.erb b/app/views/groups/new.html.erb
index f7c217e3bf..0f92866abc 100644
--- a/app/views/groups/new.html.erb
+++ b/app/views/groups/new.html.erb
@@ -11,12 +11,12 @@
     <div class="col-xs-12 col-sm-12 col-md-7 col-lg-6">
       <div class="container">
         <div class="center-row groups-background-card">
-          <%= render 'form', group: @group %>
+          <%= render "form", group: @group %>
         </div>
       </div>
     </div>
     <div class="col-xs-12 col-sm-12 col-md-5 col-lg-6">
-      <%= image_tag "PNGs/newGroup.png", alt: "New Group Sketch", :class => "groups-center-image center-image" %>
+      <%= image_tag "PNGs/newGroup.png", alt: "New Group Sketch", class: "groups-center-image center-image" %>
     </div>
   </div>
 </div>
diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb
index 354bf29651..fbc2955bf6 100644
--- a/app/views/groups/show.html.erb
+++ b/app/views/groups/show.html.erb
@@ -14,7 +14,7 @@
       <h1 class="submain-heading">
         <%= @group.name %>
         <% if policy(@group).admin_access? %>
-          <%= link_to edit_group_path(@group), class:"btn primary-button groups-editname-primary-button" do %>
+          <%= link_to edit_group_path(@group), class: "btn primary-button groups-editname-primary-button" do %>
             <%= image_tag("SVGs/editGroup.svg", alt: "Edit Group") %>
             <span><%= t("groups.show.edit_name_btn") %></span>
           <% end %>
@@ -29,7 +29,7 @@
   <div class="row center-row groups-row">
   <h3><%= t("groups.show.mentor_name_heading") %></h3>
     <% if policy(@group).admin_access? %>
-      <button type="button" class="btn primary-button groups-primary-button" data-toggle="modal" data-target="#add-mentor-to-modal" data-action="click->groups#addMentorToGroup" ><%= t("groups.show.add_mentors_btn") %></button>
+      <button type="button" class="btn primary-button groups-primary-button" data-toggle="modal" data-target="#add-mentor-to-modal" data-action="click->groups#addMentorToGroup"><%= t("groups.show.add_mentors_btn") %></button>
     <% end %>
   </div>
   <hr>
@@ -37,12 +37,12 @@
     <span class="null-text"><%= t("groups.show.no_mentors_html") %></span>
   <% end %>
   <div class="row center-row groups-members-scroll-row">
-    <%= render partial: "group_mentors", locals: {group: @group} %>
+    <%= render partial: "group_mentors", locals: { group: @group } %>
   </div>
   <div class="row center-row groups-row">
   <h3><%= t("groups.show.group_members_heading") %></h3>
     <% if policy(@group).admin_access? %>
-      <button type="button" class="btn primary-button groups-primary-button" data-toggle="modal" data-target="#addmemberModal" data-action="click->groups#addMemberToGroup" ><%= t("groups.show.add_members_btn") %></button>
+      <button type="button" class="btn primary-button groups-primary-button" data-toggle="modal" data-target="#addmemberModal" data-action="click->groups#addMemberToGroup"><%= t("groups.show.add_members_btn") %></button>
     <% end %>
   </div>
   <hr>
@@ -50,7 +50,7 @@
       <span class="null-text"><%= t("groups.show.no_members_html") %></span>
   <% end %>
   <div class="row center-row groups-members-scroll-row">
-    <%= render partial: "group_members", locals: {group: @group} %>
+    <%= render partial: "group_members", locals: { group: @group } %>
   </div>
   <div class="row center-row groups-row">
     <h3><%= t("groups.show.assignment.heading") %></h3>
@@ -85,7 +85,7 @@
                 <% if policy(@group).admin_access? && assignment.lti_integrated? %>
                  <br>
                  <a data-toggle="modal" href="#lmscredentialsModal-<%= assignment.id %>">Show LMS Credentials</a>
-                 <%= render partial: "lms_credentials_modal", locals: {assignment: assignment} %>
+                 <%= render partial: "lms_credentials_modal", locals: { assignment: assignment } %>
                 <% end %>
               <% end %>
             </div>
@@ -110,7 +110,7 @@
           </td>
           <td class="groups-assignment-button-container">
             <div class="groups-assignment-details">
-              <%= link_to group_assignment_path(@group,assignment), class:"mini-button groups-view-mini-button" do %>
+              <%= link_to group_assignment_path(@group, assignment), class: "mini-button groups-view-mini-button" do %>
                 <%= image_tag("SVGs/viewGroup.svg", alt: "View Assignment") %>
                 <span><%= t("view") %></span>
               <% end %>
@@ -118,26 +118,26 @@
             <% if policy(@group).mentor_access? %>
               <% if AssignmentDecorator.new(assignment).closed? %>
                 <div class="groups-assignment-details">
-                  <%= link_to reopen_group_assignment_path(@group,assignment), class:"mini-button groups-reopen-mini-button" do %>
+                  <%= link_to reopen_group_assignment_path(@group, assignment), class: "mini-button groups-reopen-mini-button" do %>
                     <%= image_tag("SVGs/reopenAssignment.svg", alt: "Reopen Assignment") %>
                     <span><%= t("reopen") %></span>
                   <% end %>
                 </div>
               <% else %>
                 <div class="groups-assignment-details">
-                  <%= link_to edit_group_assignment_path(@group,assignment), class:"mini-button groups-reopen-mini-button" do %>
+                  <%= link_to edit_group_assignment_path(@group, assignment), class: "mini-button groups-reopen-mini-button" do %>
                     <%= image_tag("SVGs/editGroup.svg", alt: "Edit Assignment") %>
                     <span><%= t("edit") %></span>
                   <% end %>
                 </div>
               <div class="groups-assignment-details">
-                <%= link_to close_group_assignment_path(@group,assignment), class:"mini-button groups-close-mini-button", method: :put do %>
+                <%= link_to close_group_assignment_path(@group, assignment), class: "mini-button groups-close-mini-button", method: :put do %>
                   <span><%= t("close") %></span>
                 <% end %>
               </div>
               <% end %>
               <div class="groups-assignment-details">
-                <%= link_to '#', class:"mini-button groups-delete-mini-button", data: {toggle: "modal", target: "#deleteassignmentModal", currentgroup: @group.id, currentassignment: assignment.id} do %>
+                <%= link_to "#", class: "mini-button groups-delete-mini-button", data: { toggle: "modal", target: "#deleteassignmentModal", currentgroup: @group.id, currentassignment: assignment.id } do %>
                   <%= image_tag("SVGs/deleteGroup.svg", alt: "Delete Assignment") %>
                   <span><%= t("delete") %></span>
                 <% end %>
@@ -147,14 +147,14 @@
                 <% if(assignment.deadline > Time.current) %>
                   <% if project_assignment.nil? %>
                     <div class="groups-assignment-details">
-                      <%= link_to assignment_start_path(@group,assignment), class:"mini-button groups-reopen-mini-button" do %>
+                      <%= link_to assignment_start_path(@group, assignment), class: "mini-button groups-reopen-mini-button" do %>
                         <%= image_tag("SVGs/editGroup.svg", alt: "Start Assignment") %>
                         <span><%= t("groups.show.assignment.start_working_btn") %></span>
                       <% end %>
                     </div>
                   <% else %>
                     <div class="groups-assignment-details">
-                      <%= link_to user_project_path(current_user,project_assignment), class:"mini-button groups-reopen-mini-button" do %>
+                      <%= link_to user_project_path(current_user, project_assignment), class: "mini-button groups-reopen-mini-button" do %>
                         <%= image_tag("SVGs/viewGroup.svg", alt: "View work") %>
                         <span><%= t("groups.show.assignment.see_work_done") %></span>
                       <% end %>
@@ -165,7 +165,7 @@
                     <h6 class="groups-no-assignment-submission-text"><%= t("groups.show.assignment.not_submitted") %></h6>
                   <% else %>
                     <div class="groups-assignment-details">
-                      <%= link_to user_project_path(current_user,project_assignment), class:"mini-button groups-reopen-mini-button" do %>
+                      <%= link_to user_project_path(current_user, project_assignment), class: "mini-button groups-reopen-mini-button" do %>
                         <%= image_tag("SVGs/viewGroup.svg", alt: "View submission") %>
                         <span><%= t("groups.show.assignment.show_submission") %></span>
                       <% end %>
@@ -238,7 +238,7 @@
               <th class="groups-collapsed-table-head groups-assignment-details"><%= t("groups.show.assignment.assignment_table_head.actions") %></th>
               <td class="groups-assignment-button-container">
                 <div class="groups-assignment-details">
-                  <%= link_to group_assignment_path(@group,assignment), class:"mini-button groups-view-mini-button" do %>
+                  <%= link_to group_assignment_path(@group, assignment), class: "mini-button groups-view-mini-button" do %>
                     <%= image_tag("SVGs/viewGroup.svg", alt: "View Assignment") %>
                     <span><%= t("view") %></span>
                   <% end %>
@@ -246,14 +246,14 @@
                 <% if policy(@group).admin_access? %>
                   <% if AssignmentDecorator.new(assignment).closed? %>
                     <div class="groups-assignment-details">
-                      <%= link_to reopen_group_assignment_path(@group,assignment), class:"mini-button groups-reopen-mini-button" do %>
+                      <%= link_to reopen_group_assignment_path(@group, assignment), class: "mini-button groups-reopen-mini-button" do %>
                         <%= image_tag("SVGs/reopenAssignment.svg", alt: "Reopen Assignment") %>
                         <span><%= t("reopen") %></span>
                       <% end %>
                     </div>
                   <% else %>
                     <div class="groups-assignment-details">
-                      <%= link_to edit_group_assignment_path(@group,assignment), class:"mini-button groups-reopen-mini-button" do %>
+                      <%= link_to edit_group_assignment_path(@group, assignment), class: "mini-button groups-reopen-mini-button" do %>
                         <%= image_tag("SVGs/editGroup.svg", alt: "Edit Assignment") %>
                         <span><%= t("edit") %></span>
                       <% end %>
@@ -261,7 +261,7 @@
 
                   <% end %>
                   <div class="groups-assignment-details">
-                    <%= link_to '#', class:"mini-button groups-delete-mini-button", data: {toggle: "modal", target: "#deleteassignmentModal", currentgroup: @group.id, currentassignment: assignment.id} do %>
+                    <%= link_to "#", class: "mini-button groups-delete-mini-button", data: { toggle: "modal", target: "#deleteassignmentModal", currentgroup: @group.id, currentassignment: assignment.id } do %>
                       <%= image_tag("SVGs/deleteGroup.svg", alt: "Delete Assignment") %>
                       <span><%= t("delete") %></span>
                     <% end %>
@@ -271,14 +271,14 @@
                     <% if(assignment.deadline > Time.current) %>
                       <% if project_assignment.nil? %>
                         <div class="groups-assignment-details">
-                          <%= link_to assignment_start_path(@group,assignment), class:"mini-button groups-reopen-mini-button" do %>
+                          <%= link_to assignment_start_path(@group, assignment), class: "mini-button groups-reopen-mini-button" do %>
                             <%= image_tag("SVGs/editGroup.svg", alt: "Start Assignment") %>
                             <span><%= t("groups.show.assignment.start_working_btn") %></span>
                           <% end %>
                         </div>
                       <% else %>
                         <div class="groups-assignment-details">
-                          <%= link_to user_project_path(current_user,project_assignment), class:"mini-button groups-reopen-mini-button" do %>
+                          <%= link_to user_project_path(current_user, project_assignment), class: "mini-button groups-reopen-mini-button" do %>
                             <%= image_tag("SVGs/viewGroup.svg", alt: "View work") %>
                             <span><%= t("groups.show.assignment.see_work_done") %></span>
                           <% end %>
@@ -293,7 +293,7 @@
                       </div>
                       <% else %>
                         <div class="groups-assignment-details">
-                          <%= link_to user_project_path(current_user,project_assignment), class:"mini-button groups-reopen-mini-button" do %>
+                          <%= link_to user_project_path(current_user, project_assignment), class: "mini-button groups-reopen-mini-button" do %>
                             <%= image_tag("SVGs/viewGroup.svg", alt: "View submission") %>
                             <span><%= t("groups.show.assignment.show_submission") %></span>
                           <% end %>
@@ -334,13 +334,13 @@
   </table>
   <div class="row">
     <div class="col-12 groups-back-button-container">
-      <%= link_to t("back"), :back ,class:"anchor-text" %>
+      <%= link_to t("back"), :back, class: "anchor-text" %>
     </div>
   </div>
   <%= render partial: "delete_member_confirmation_modal" %>
   <%= render partial: "delete_assignment_confirmation_modal" %>
-  <%= render partial: "add_member_modal", locals: {group_member: @group_member} %>
-  <%= render partial: "add_mentor_modal", locals: {group_member: @group_member} %>
+  <%= render partial: "add_member_modal", locals: { group_member: @group_member } %>
+  <%= render partial: "add_mentor_modal", locals: { group_member: @group_member } %>
   <%= render partial: "promote_member_confirmation_modal" %>
 </div>
 
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index f91c48dd8a..322ddd29a5 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -37,7 +37,7 @@
             <a href="/teachers"><h6><%= t("layout.link_to_teachers") %></h6></a>
             <a href="/about"><h6><%= t("layout.link_to_about") %></h6></a>
             <% if Flipper.enabled?(:forum) %>
-              <h6><%= link_to t("layout.footer.link_to_forum") , simple_discussion_path %></h6>
+              <h6><%= link_to t("layout.footer.link_to_forum"), simple_discussion_path %></h6>
             <% end %>
           </div>
         </div>
@@ -75,7 +75,7 @@
     </div>
     <div class="row">
       <div class="col-12 text-white text-left footer-copyright-text">
-  <p><%= t("layout.footer.copyright_text",time_current_year: Time.current.year) %></p>
+  <p><%= t("layout.footer.copyright_text", time_current_year: Time.current.year) %></p>
       </div>
     </div>
   </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 0e28be5404..1a5f52c73a 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,9 +1,9 @@
-<nav class="<%= 'navbar-announcement'  if current_announcement %> navbar navbar-expand-lg bg-white">
+<nav class="navbar navbar-expand-lg bg-white">
   <a class="navbar-brand" href="/">
     <%= image_tag("CircuitVerse.svg", class: "navbar-logo", alt: "CircuitVerse Logo") %>
   </a>
   <div class="center-row navbar-search-icon-container navbar-search-icon-oncollapse">
-    <i class="fa fa-search search-icon <%= request.path == '/search' ? 'active' : '' %>" tabindex="0" aria-label="search"></i>
+    <i class="fa fa-search search-icon <%= request.path == "/search" ? "active" : "" %>" tabindex="0" aria-label="search"></i>
   </div>
   <button class="navbar-toggler navbar-light" type="button" data-toggle="collapse" data-target="#collapsed-navbar"
   aria-controls="collapsedNavbar" aria-expanded="false" aria-label="Toggle navigation">
@@ -13,7 +13,7 @@
     <ul class="navbar-nav ml-auto navigationBar-item">
       <li class="nav-item px-1 pt-1 navbar-search-icon-onexpand">
         <div class="center-row navbar-search-icon-container">
-          <i class="fa fa-search search-icon <%= request.path == '/search' ? 'active' : '' %>" tabindex="0" aria-label="search"></i>
+          <i class="fa fa-search search-icon <%= request.path == "/search" ? "active" : "" %>" tabindex="0" aria-label="search"></i>
         </div>
       </li>
       <li class="nav-item px-1">
@@ -29,16 +29,16 @@
         </li>
       </div>
       <li class="nav-item px-1">
-        <a class="nav-link navbar-item navbar-text <%= request.path == '/features' ? 'active' : '' %>" href="/#home-features-section"><%= t("layout.link_to_features") %></a>
+        <a class="nav-link navbar-item navbar-text <%= request.path == "/features" ? "active" : "" %>" href="/#home-features-section"><%= t("layout.link_to_features") %></a>
       </li>
       <li class="nav-item px-1">
-        <a class="nav-link navbar-item navbar-text <%= request.path == '/teachers' ? 'active' : '' %>" href="/teachers"><%= t("layout.link_to_teachers") %></a>
+        <a class="nav-link navbar-item navbar-text <%= request.path == "/teachers" ? "active" : "" %>" href="/teachers"><%= t("layout.link_to_teachers") %></a>
       </li>
       <li class="nav-item px-1">
-        <a class="nav-link navbar-item navbar-text <%= request.path == '/blog' ? 'active' : '' %>" href="https://blog.circuitverse.org/" target="_blank"><%= t("layout.link_to_blog") %></a>
+        <a class="nav-link navbar-item navbar-text <%= request.path == "/blog" ? "active" : "" %>" href="https://blog.circuitverse.org/" target="_blank"><%= t("layout.link_to_blog") %></a>
       </li>
       <li class="nav-item px-1">
-        <a class="nav-link navbar-item navbar-text <%= request.path == '/about' ? 'active' : '' %>" href="/about"><%= t("layout.link_to_about") %></a>
+        <a class="nav-link navbar-item navbar-text <%= request.path == "/about" ? "active" : "" %>" href="/about"><%= t("layout.link_to_about") %></a>
       </li>
       <%= render "layouts/notifications" %>
       <% if user_signed_in? %>
@@ -57,7 +57,7 @@
       </div>
       <% else %>
         <li class="nav-item px-1">
-          <a class="nav-link navbar-item navbar-text <%= request.path == '/users/sign_in' ? 'active' : '' %>" href="/users/sign_in"><%= t("login") %></a>
+          <a class="nav-link navbar-item navbar-text <%= request.path == "/users/sign_in" ? "active" : "" %>" href="/users/sign_in"><%= t("login") %></a>
         </li>
       <% end %>
     </ul>
diff --git a/app/views/layouts/_notifications.html.erb b/app/views/layouts/_notifications.html.erb
index 697d72444b..76a813840d 100644
--- a/app/views/layouts/_notifications.html.erb
+++ b/app/views/layouts/_notifications.html.erb
@@ -39,10 +39,10 @@
       <% end %>
       <div class="d-flex align-items-center justify-content-center mb-2 mt-3">
         <% if @unread.count.positive? %>
-          <%= link_to t("users.notifications.mark_as_read_button"), read_all_notifications_url(current_user), :method=> :patch, class: "anchor-text-left" %>
-          <%= link_to t("users.notifications.see_all"), notifications_path(current_user), :class=>"anchor-text-right" %>
+          <%= link_to t("users.notifications.mark_as_read_button"), read_all_notifications_url(current_user), method: :patch, class: "anchor-text-left" %>
+          <%= link_to t("users.notifications.see_all"), notifications_path(current_user), class: "anchor-text-right" %>
         <% else %>
-        <%= link_to t("users.notifications.see_all"), notifications_path(current_user), :class=>"anchor-text" %>
+        <%= link_to t("users.notifications.see_all"), notifications_path(current_user), class: "anchor-text" %>
         <% end %>
       </div>
     </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1177449f87..36c81af4d6 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,19 +3,19 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <%= display_meta_tags description: yield(:description).presence  || Rails.configuration.site_description,
-    title: yield(:title).presence || 'CircuitVerse - Digital Circuit Simulator' %>
+    <%= display_meta_tags description: yield(:description).presence || Rails.configuration.site_description,
+                          title: yield(:title).presence || "CircuitVerse - Digital Circuit Simulator" %>
     <meta name="keywords"
       content="Digital circuits, logisim, online, educational platform, karnaugh map, kmap, electronic devices and circuits,digital electronics basics,introduction to digital electronics, simple electronics projects for students,electric circuit analysis, logic circuits, logic simulation, digital logic circuits, boolean logic">
-    <%= favicon_link_tag 'favicon.ico' %>
+    <%= favicon_link_tag "favicon.ico" %>
 
-    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track": "reload" %>
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400&display=swap" rel="stylesheet">
     <%= csrf_meta_tags %>
 
-    <%= javascript_include_tag 'application_sprockets', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload', defer: true %>
+    <%= javascript_include_tag "application_sprockets", "data-turbolinks-track": "reload" %>
+    <%= javascript_include_tag "application", "data-turbolinks-track": "reload", defer: true %>
 
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <%= render partial: "layouts/google_analytics" if Rails.env.production? %>
@@ -23,7 +23,6 @@
   </head>
 
   <body>
-    <%= render "announcements/announcement" %>
     <%= render "layouts/header" %>
     <%= yield %>
     <%= render "layouts/footer" %>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 5eeded01bf..eac0d08a5e 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -27,7 +27,7 @@
         <a href="https://github.com/CircuitVerse/CircuitVerse"><%= inline_svg_tag "SVGs/github.svg", alt: "Github Logo", class: "mailer-social-image" %></a>
       </div>
     </div>
-    <h5 class="mailer-copyright-text"><%= t("layout.mailer.copyright_text",time_current_year: Time.current.year) %></h6>
+    <h5 class="mailer-copyright-text"><%= t("layout.mailer.copyright_text", time_current_year: Time.current.year) %></h6>
     <% unless @is_preview %>
       <h5> <%= link_to t("layout.mailer.unsubscribe_email_notifications"), mailkick_unsubscribe_url %> </h6>
     <% end %>
diff --git a/app/views/layouts/simulator.html.erb b/app/views/layouts/simulator.html.erb
index f7c162ae06..227b2ed508 100644
--- a/app/views/layouts/simulator.html.erb
+++ b/app/views/layouts/simulator.html.erb
@@ -4,9 +4,9 @@
     <%= csrf_meta_tags %>
     <script>window.locale = "<%= I18n.locale %>"</script>
     <script src="/js/pace.js"></script>
-    <%= stylesheet_link_tag  'simulator', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'simulator', 'data-turbolinks-track': 'reload' %>
-    <%= favicon_link_tag 'favicon.ico' %>
+    <%= stylesheet_link_tag "simulator", media: "all", "data-turbolinks-track": "reload" %>
+    <%= javascript_include_tag "simulator", "data-turbolinks-track": "reload" %>
+    <%= favicon_link_tag "favicon.ico" %>
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <%= render "layouts/google_analytics" %>
   </head>
diff --git a/app/views/layouts/simulator_old.html.erb b/app/views/layouts/simulator_old.html.erb
index b257526bb9..baa4c6a04c 100644
--- a/app/views/layouts/simulator_old.html.erb
+++ b/app/views/layouts/simulator_old.html.erb
@@ -4,9 +4,9 @@
     <title><%= t("layout.simulator.title") %></title>
     <%= csrf_meta_tags %>
 
-    <%= stylesheet_link_tag    'simulator', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'simulator', 'data-turbolinks-track': 'reload' %>
-    <%= favicon_link_tag 'favicon.ico' %>
+    <%= stylesheet_link_tag "simulator", media: "all", "data-turbolinks-track": "reload" %>
+    <%= javascript_include_tag "simulator", "data-turbolinks-track": "reload" %>
+    <%= favicon_link_tag "favicon.ico" %>
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <%= render "layouts/google_analytics" %>
   </head>
diff --git a/app/views/layouts/testbench.html.erb b/app/views/layouts/testbench.html.erb
index 8ee2e732a8..d542dd6d37 100644
--- a/app/views/layouts/testbench.html.erb
+++ b/app/views/layouts/testbench.html.erb
@@ -4,10 +4,10 @@
     <%= csrf_meta_tags %>
     <script>window.locale = "<%= I18n.locale %>"</script>
     <script src="/js/pace.js"></script>
-    <%= javascript_include_tag 'testbench', 'data-turbolinks-track': 'reload' %>
-    <%= stylesheet_link_tag  'simulator', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= stylesheet_link_tag  'testbench', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= favicon_link_tag 'favicon.ico' %>
+    <%= javascript_include_tag "testbench", "data-turbolinks-track": "reload" %>
+    <%= stylesheet_link_tag "simulator", media: "all", "data-turbolinks-track": "reload" %>
+    <%= stylesheet_link_tag "testbench", media: "all", "data-turbolinks-track": "reload" %>
+    <%= favicon_link_tag "favicon.ico" %>
 
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <%= render partial: "layouts/google_analytics" if Rails.env.production? %>
diff --git a/app/views/pending_invitation_mailer/new_pending_email.html.erb b/app/views/pending_invitation_mailer/new_pending_email.html.erb
index 8e98819773..066b30fd1b 100644
--- a/app/views/pending_invitation_mailer/new_pending_email.html.erb
+++ b/app/views/pending_invitation_mailer/new_pending_email.html.erb
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
   </head>
   <body>
     <h1>Welcome to CircuitVerse></h1>
     <p>
-      You have been added to a new group named <%= @group.name %> by <%= User.find_by(id:@group.primary_mentor_id).name%>.<br><br>
+      You have been added to a new group named <%= @group.name %> by <%= User.find_by(id: @group.primary_mentor_id).name %>.<br><br>
       Sign up with CircuitVerse to explore the digital world. You can use the group once you have signed up with CircuitVerse.
     </p>
     <br>
diff --git a/app/views/projects/_add_collaborator_modal.html.erb b/app/views/projects/_add_collaborator_modal.html.erb
index 9ba3007026..16071c3c78 100644
--- a/app/views/projects/_add_collaborator_modal.html.erb
+++ b/app/views/projects/_add_collaborator_modal.html.erb
@@ -23,10 +23,10 @@
         </div>
         <div class="form-group">
           <%= form.label :emails %>
-          <%= form.select :emails,[ ],{},{ class:'form-select', multiple: true } %>
+          <%= form.select :emails, [], {}, { class: "form-select", multiple: true } %>
         </div>
         <div class="modal-footer">
-          <%= form.submit class: 'btn primary-button add-collaborators-button' %>
+          <%= form.submit class: "btn primary-button add-collaborators-button" %>
         </div>
         <% end %>
       </div>
@@ -41,7 +41,7 @@ $(document).ready(() => {
     multiple: true,
     tokenSeparators: [',', ' '],
   });
-  
+
   $('.select2-selection input').attr('maxlength', '30'); // to limit the no. of chars entered in input box to avoid the overflow
 
   $('.add-collaborators-button').attr('disabled', true); // setting submit button to disabled initially
@@ -94,4 +94,4 @@ $(document).ready(() => {
   });
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/projects/_delete_collaboration_confirmation_modal.html.erb b/app/views/projects/_delete_collaboration_confirmation_modal.html.erb
index d998254a7b..9584659c80 100644
--- a/app/views/projects/_delete_collaboration_confirmation_modal.html.erb
+++ b/app/views/projects/_delete_collaboration_confirmation_modal.html.erb
@@ -9,7 +9,7 @@
         <p><%= t("projects.remove_collaborator_message") %></p>
       </div>
       <div class="modal-footer">
-        <%= link_to '#', method: :delete, class: "btn primary-delete-button", id: "projects-collaboration-delete-button" do %>
+        <%= link_to "#", method: :delete, class: "btn primary-delete-button", id: "projects-collaboration-delete-button" do %>
         <%= t("delete") %>
         <% end %>
       </div>
diff --git a/app/views/projects/_delete_project_confirmation_modal.html.erb b/app/views/projects/_delete_project_confirmation_modal.html.erb
index 8ecdb77598..1cd0eb9b21 100644
--- a/app/views/projects/_delete_project_confirmation_modal.html.erb
+++ b/app/views/projects/_delete_project_confirmation_modal.html.erb
@@ -9,7 +9,7 @@
         <p><%= t("projects.delete_project_message") %></p>
       </div>
       <div class="modal-footer">
-        <%= link_to '#', method: :delete, class: "btn primary-delete-button", id: "projects-delete-button" do %>
+        <%= link_to "#", method: :delete, class: "btn primary-delete-button", id: "projects-delete-button" do %>
           <%= t("delete") %>
         <% end %>
       </div>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 2aa558e1b8..82a22f7f57 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -1,6 +1,6 @@
 
 <% if policy(@project).can_feature? %>
-  <%= form_with(model: FeaturedCircuit.new, url: '/featured_circuits', multipart: true, id:"featuredCircuit") do |form| %>
+  <%= form_with(model: FeaturedCircuit.new, url: "/featured_circuits", multipart: true, id: "featuredCircuit") do |form| %>
     <%= form.hidden_field :project_id, value: @project.id %>
     <div class="form-group projects-primary-checkpoint">
       <label for="featured_checkbox" class="primary-checkpoint-container"><h6><%= t("projects.form.feature_circuit_checkpoint") %></h6>
@@ -11,7 +11,7 @@
   <% end %>
 <% end %>
 
-<%= form_with(model: [ @project.author, @project] , local: true, multipart: true, id:"projectForm") do |form| %>
+<%= form_with(model: [@project.author, @project], local: true, multipart: true, id: "projectForm") do |form| %>
   <% if project.errors.any? %>
     <div id="error-message">
       <ul>
@@ -23,11 +23,11 @@
   <% end %>
   <div class="field form-group">
     <h6><%= form.label :name %></h6>
-    <%= form.text_field :name, id: :project_name, class: 'form-control form-input' %>
+    <%= form.text_field :name, id: :project_name, class: "form-control form-input" %>
   </div>
   <div class="field form-group projects-tag-form-group">
     <h6><%= form.label :tag_list %></h6> <span><%= t("projects.form.tag_list_description") %></span>
-    <%= form.text_field :tag_list, class: 'form-control form-input' %>
+    <%= form.text_field :tag_list, class: "form-control form-input" %>
   </div>
   <div class="field form-group">
     <h6 class="projects-type-field-heading"><%= form.label :project_access_type %></h6>
@@ -35,20 +35,19 @@
       <%= @warning %>
         <span class="projects-type-field-warning"><i class="fa fa-exclamation-triangle"></i> <%= t("projects.form.project_is_featured_message") %></span>
       <% end %>
-    <%= form.select :project_access_type, [[t("projects.form.public"),"Public"],[t("projects.form.private"),"Private"],[t("projects.form.limited_access"),"Limited access"]], {},  class: 'form-control form-input' %>
+    <%= form.select :project_access_type, [[t("projects.form.public"), "Public"], [t("projects.form.private"), "Private"], [t("projects.form.limited_access"), "Limited access"]], {}, class: "form-control form-input" %>
   </div>
   <div class="field form-group" id="description">
     <h6><%= form.label :description %></h6>
-    <%= render :partial => 'editor/index', :locals => {:content => @project.description} %>
+    <%= render partial: "editor/index", locals: { content: @project.description } %>
   </div>
   <div class="field form-group" onclick="beforeSubmit()">
-    <%= form.submit class: 'btn primary-button' %> &nbsp;
-    <%= link_to t("back"), :back, class: 'anchor-text' %>
+    <%= form.submit class: "btn primary-button" %> &nbsp;
+    <%= link_to t("back"), :back, class: "anchor-text" %>
   </div>
 
 <% end %>
 
-
 <script>
   function beforeSubmit() {
     generateFeaturedCircuit()
diff --git a/app/views/projects/edit.html.erb b/app/views/projects/edit.html.erb
index f3031a5ef0..af74b8f19e 100644
--- a/app/views/projects/edit.html.erb
+++ b/app/views/projects/edit.html.erb
@@ -10,7 +10,7 @@
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <div class="form-container">
-        <%= render 'form', project: @project %>
+        <%= render "form", project: @project %>
       </div>
     </div>
   </div>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 15eb6e345b..e7e75f6faa 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -2,20 +2,20 @@
 <% content_for :description, @project.description %>
 <% set_meta_tags author: @project.author.name %>
 <% set_meta_tags twitter: {
-  card: "summary_large_image",
-  title: yield(:title),
-  description: @project.description,
-  image: {
-    src: "#{Rails.configuration.site_url}#{@project.image_preview}"
-  }
-  } %>
+     card: "summary_large_image",
+     title: yield(:title),
+     description: @project.description,
+     image: {
+       src: "#{Rails.configuration.site_url}#{@project.image_preview}"
+     }
+   } %>
 <% set_meta_tags og: {
-  title: yield(:title),
-  image: "#{Rails.configuration.site_url}#{@project.image_preview}",
-  description: @project.description,
-  type: "article",
-  site_name: Rails.configuration.site_name
-  } %>
+     title: yield(:title),
+     image: "#{Rails.configuration.site_url}#{@project.image_preview}",
+     description: @project.description,
+     type: "article",
+     site_name: Rails.configuration.site_name
+   } %>
 <div class="container" data-controller="projects">
   <% if notice %>
   <div class="row" id='alertdiv'>
@@ -30,7 +30,7 @@
     <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7 ">
       <div class="projects-iframe-container">
         <div class="embed-responsive embed-responsive-4by3">
-          <iframe src=<%= simulator_path(@project) %> id="view" webkitAllowFullScreen mozAllowFullScreen allowFullScreen scrolling="no"></iframe>
+          <iframe src=<%= simulator_path(@project) %>></iframe>
         </div>
       </div>
     </div>
@@ -56,7 +56,7 @@
           <div class="projects-search-tags-container">
             <% if !@project.tags.empty? %>
               <% @project.tags.each do |tag| %>
-                <%= link_to tag.name, tag_path(tag.name),class: "badge search-tag" %>
+                <%= link_to tag.name, tag_path(tag.name), class: "badge search-tag" %>
               <% end %>
             <% end %>
           </div>
@@ -67,7 +67,7 @@
           <% if !@project.forked_project.nil? %>
             <p>
               <strong><%= t("projects.show.project_forked_from") %> </strong>
-              <%= link_to @project.forked_project.author.name+"/"+@project.forked_project.name, user_project_path(@project.forked_project.author,@project.forked_project), class: "anchor-text",method: :post %>
+              <%= link_to "#{@project.forked_project.author.name}/#{@project.forked_project.name}", user_project_path(@project.forked_project.author, @project.forked_project), class: "anchor-text", method: :post %>
             </p>
           <% end %>
           <p>
@@ -78,12 +78,12 @@
             <p>
               <strong><%= t("projects.show.project_description") %> </strong>
             </p>
-            <div class="projects-details-description"><%= sanitize@project.description %></div>
+            <div class="projects-details-description"><%= sanitize @project.description %></div>
           <% end %>
           <p title="<%= @project.created_at.strftime("%B %d, %Y, %l:%M %p UTC %:z") %>">
             <strong><%= t("projects.show.project_created_at") %> </strong>
             <% if @project.created_at >= 14.days.ago %>
-              <%= time_ago_in_words(@project.created_at, include_seconds: true) + " ago" %>
+              <%= "#{time_ago_in_words(@project.created_at, include_seconds: true)} ago" %>
             <% else %>
              <%= @project.created_at.strftime("%b %d, %Y") %>
             <% end %>
@@ -91,7 +91,7 @@
           <p title="<%= @project.updated_at.strftime("%B %d, %Y, %l:%M %p UTC %:z") %>">
             <strong><%= t("projects.show.project_updated_at") %> </strong>
             <% if @project.updated_at >= 14.days.ago %>
-              <%= time_ago_in_words(@project.updated_at, include_seconds: true) + " ago" %>
+              <%= "#{time_ago_in_words(@project.updated_at, include_seconds: true)} ago" %>
             <% else %>
               <%= @project.updated_at.strftime("%b %d, %Y") %>
             <% end %>
@@ -108,7 +108,7 @@
               </a>
               <% end %>
               <% if policy(@project).author_access? %>
-                <%= link_to create_fork_project_path(@project),id:"copy_paste", class: "btn primary-button projects-primary-button", method: :post do %>
+                <%= link_to create_fork_project_path(@project), id: "copy_paste", class: "btn primary-button projects-primary-button", method: :post do %>
                   <%= image_tag("SVGs/createCopy.svg", alt: "Create Copy") %>
                   <span><%= t("projects.show.project_copy") %></span>
                 <% end %>
@@ -137,7 +137,7 @@
                 <%= image_tag("SVGs/editProject.svg", alt: "Edit Project") %>
                 <span><%= t("edit") %></span>
               <% end %>
-              <%= link_to "#", class: "btn secondary-button", data: {toggle: "modal", target: "#deleteprojectModal", currentauthor: @author.id, currentproject: @project.id} do %>
+              <%= link_to "#", class: "btn secondary-button", data: { toggle: "modal", target: "#deleteprojectModal", currentauthor: @author.id, currentproject: @project.id } do %>
                 <%= image_tag("SVGs/deleteProject.svg", alt: "Delete Project") %>
                 <span><%= t("delete") %></span>
               <% end %>
@@ -179,7 +179,7 @@
                   </div>
                   <div class="col-xs-4 col-sm-4 col-md-3 col-lg-3">
                     <div class="projects-collaborators-button-container">
-                      <%= link_to "#", data: {toggle: "modal", target: "#deletecollaborationModal", currentcollaboration: Collaboration.find_by(user_id:user.id, project_id:@project.id).id }, class: "btn primary-delete-button" do %>
+                      <%= link_to "#", data: { toggle: "modal", target: "#deletecollaborationModal", currentcollaboration: Collaboration.find_by(user_id: user.id, project_id: @project.id).id }, class: "btn primary-delete-button" do %>
                         <%= image_tag("SVGs/deleteGroup.svg", alt: "Delete Collaboration") %>
                         <span><%= t("remove") %></span>
                       <% end %>
diff --git a/app/views/simulator/edit.html.erb b/app/views/simulator/edit.html.erb
index 29ccead144..bb5478c1c5 100644
--- a/app/views/simulator/edit.html.erb
+++ b/app/views/simulator/edit.html.erb
@@ -1,4 +1,4 @@
-<% content_for(:html_title) { 'CircuitVerse - Digital Simulator' } %>
+<% content_for(:html_title) { "CircuitVerse - Digital Simulator" } %>
 
 <script src="/js/plugins/jquery.twbs-toggle-buttons.min.js"></script>
 <script src="/js/plugins/checkBo.min.js"></script>
@@ -16,9 +16,9 @@
   <button class="navbar-toggler collapsed" type="button" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-controls="collapsedNavbar" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
-  <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+  <div class="collapse navbar-collapse justify-content-between" id="bs-example-navbar-collapse-1">
     <ul class="navbar-nav navbar-menu noSelect pointerCursor" id="toolbar">
-      <li class="dropdown nav-dropdown">
+      <li class="dropdown nav-dropdown d-flex">
         <a href="#" class="" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><%= t("simulator.nav_item.project") %><span></span></a>
         <ul class="dropdown-menu">
           <% if not @project.nil? %>
@@ -33,10 +33,9 @@
            <li><a class="dropdown-item logixButton text-left pl-1" id="clearProject">Clear Project</a></li>
           <li><a class="dropdown-item logixButton text-left pl-1" id="recoverProject">Recover Project</a></li>
           <li><a class="dropdown-item logixButton text-left pl-1" id="fullViewOption">Preview Circuit</a></li>
-          <li><a class="dropdown-item logixButton text-left pl-1" onclick="old_ui_redirect()">View Previous UI</a></li>
         </ul>
       </li>
-      <li class="dropdown nav-dropdown">
+      <li class="dropdown nav-dropdown d-flex">
         <a href="#" class="" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><%= t("simulator.nav_item.circuit") %><span class="caret"></span></a>
         <ul class="dropdown-menu">
           <li><a class="dropdown-item text-left logixButton pl-1" id="createNewCircuitScope">New Circuit + </a></li>
@@ -44,7 +43,7 @@
           <li><a class="dropdown-item logixButton text-left pl-1" id="createSubCircuitPrompt">Insert SubCircuit</a></li>
         </ul>
       </li>
-      <li class="dropdown nav-dropdown">
+      <li class="dropdown nav-dropdown d-flex">
         <a href="#" class="" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><%= t("simulator.nav_item.tools") %><span class="caret"></span></a>
         <ul class="dropdown-menu">
           <li><a class="dropdown-item text-left pl-1 logixButton" id="createCombinationalAnalysisPrompt">Combinational<br>Analysis</a></li>
@@ -55,7 +54,7 @@
           <li><a class="dropdown-item text-left pl-1 logixButton" id="generateVerilog">Export Verilog</a>
         </ul>
       </li>
-      <li class="dropdown tour-help nav-dropdown">
+      <li class="dropdown tour-help nav-dropdown d-flex">
         <a href="#" class="" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><%= t("simulator.nav_item.help") %><span class="caret"></span></a>
         <ul class="dropdown-menu">
             <li><a class="dropdown-item text-left pl-1 logixButton" id="showTourGuide">Tutorial Guide</a></li>
@@ -64,37 +63,56 @@
             <li><a class="dropdown-item text-left pl-1" href="https://circuitverse.org/forum" class="forum-tab" target="_blank" role="button" aria-haspopup="true" aria-expanded="false">Discussion Forum</a></li>
         </ul>
       </li>
-     </ul>
-       <span class="projectName noSelect defaultCursor font-weight-bold" id="projectName">
+      </ul>
+      <span class="projectName noSelect defaultCursor font-weight-bold" id="projectName">
           Untitled
-       </span>
+      </span>
+
+      <ul class="nav navbar-nav noSelect pointerCursor pull-right account-btn">
+        <li class="dropdown pull-right">
+          <% if user_signed_in? %>
+            <a href="#" class="cur-user acc-drop user-field" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><%= current_user.name %><span class="caret acc-caret"></span></a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href=<%= user_path(current_user) %>>Dashboard</a></li>
+              <li><a class="dropdown-item" href=<%= user_groups_path(current_user) %>>My Groups</a></li>
+              <li><a class="dropdown-item" href=<%= notifications_path(current_user) %>>Notifications</a></li>
+              <div class="dropdown-divider"></div>
+              <li><a class="dropdown-item" rel="nofollow" data-method="delete" href=<%= destroy_user_session_path %>>Sign Out</a></li>
+            </ul>
+          <% else %>
+            <a class="navbar-nav signIn-btn user-field" href=<%= new_user_session_path %>> Sign In </a>
+          <% end %>
+        </li>
+      </ul>
+
+    </div>
 
     <div ondrag="(() => {$('.quick-btn').css({'box-shadow': 'none', 'background': 'var(--bg-navbar)'})})()" class='quick-btn' id='quick-btn-id'>
       <div id='dragQPanel' class='panel-drag'>
       <span><svg style="height: 20px;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="31" viewBox="0 0 18 31">
         <defs>
           <clipPath id="clip-path">
-            <rect width="18" height="31" fill="none"/>
+            <rect width="18" height="31" fill="none" />
           </clipPath>
         </defs>
         <g id="Repeat_Grid_1" data-name="Repeat Grid 1" clip-path="url(#clip-path)">
           <g transform="translate(-21 -29)">
-            <circle id="Ellipse_1" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff"/>
+            <circle id="Ellipse_1" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff" />
           </g>
           <g transform="translate(-12 -29)">
-            <circle id="Ellipse_1-2" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff"/>
+            <circle id="Ellipse_1-2" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff" />
           </g>
           <g transform="translate(-21 -18)">
-            <circle id="Ellipse_1-3" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff"/>
+            <circle id="Ellipse_1-3" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff" />
           </g>
           <g transform="translate(-12 -18)">
-            <circle id="Ellipse_1-4" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff"/>
+            <circle id="Ellipse_1-4" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff" />
           </g>
           <g transform="translate(-21 -7)">
-            <circle id="Ellipse_1-5" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff"/>
+            <circle id="Ellipse_1-5" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff" />
           </g>
           <g transform="translate(-12 -7)">
-            <circle id="Ellipse_1-6" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff"/>
+            <circle id="Ellipse_1-6" data-name="Ellipse 1" cx="2" cy="2" r="2" transform="translate(22 30)" fill="#fff" />
           </g>
         </g>
       </svg>
@@ -136,29 +154,11 @@
         </button> -->
         <div class="zoom-slider">
           <button class="zoom-slider-decrement" id="decrement">-</button>
-          <input type="range" class="custom-range" min="0" max="45" step="1"  id="customRange1">
+          <input type="range" class="custom-range" min="0" max="45" step="1" id="customRange1">
           <span id='slider_value'></span>
           <button class="zoom-slider-increment" id="increment">+</button>
         </div>
       </div>
-
-    </div>
-    <ul class="nav navbar-nav noSelect pointerCursor pull-right account-btn">
-      <li class="dropdown pull-right">
-        <% if user_signed_in? %>
-          <a href="#" class="cur-user acc-drop user-field" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><%= current_user.name %><span class="caret acc-caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a class="dropdown-item" href=<%= user_path(current_user) %>>Dashboard</a></li>
-            <li><a class="dropdown-item" href=<%= user_groups_path(current_user) %>>My Groups</a></li>
-            <li><a class="dropdown-item" href=<%= notifications_path(current_user) %>>Notifications</a></li>
-            <div class="dropdown-divider"></div>
-            <li><a class="dropdown-item" rel="nofollow" data-method="delete" href=<%= destroy_user_session_path %>>Sign Out</a></li>
-          </ul>
-        <% else %>
-          <a class="navbar-nav signIn-btn user-field" href=<%= new_user_session_path %>> Sign In </a>
-        <% end %>
-      </li>
-    </ul>
   </div>
   <!-- /.navbar-collapse -->
 </nav>
@@ -497,16 +497,14 @@
       <button
         class="zoomButton btn-lg"
         id="decreaseLayoutWidth"
-        title="Decrease Width"
-      >
+        title="Decrease Width">
         <span class="fa fa-minus" aria-hidden="true"></span>
       </button>
       <span>Width</span>
       <button
         class="zoomButton btn-lg"
         id="increaseLayoutWidth"
-        title="Increase Width"
-      >
+        title="Increase Width">
         <span class="fa fa-plus" aria-hidden="true"></span>
       </button>
     </div>
@@ -514,16 +512,14 @@
       <button
         class="zoomButton btn-lg"
         id="decreaseLayoutHeight"
-        title="Decrease Height"
-      >
+        title="Decrease Height">
         <span class="fa fa-minus" aria-hidden="true"></span>
       </button>
       <span>Height</span>
       <button
         class="zoomButton btn-lg"
         id="increaseLayoutHeight"
-        title="Increase Height"
-      >
+        title="Increase Height">
         <span class="fa fa-plus" aria-hidden="true"></span>
       </button>
     </div>
@@ -531,8 +527,7 @@
       <span>Reset all nodes:</span>
       <button
         class="zoomButton btn-lg"
-        id="layoutResetNodes"
-      >
+        id="layoutResetNodes">
         <span class="fa fa-sync" aria-hidden="true" title="Reset"></span>
       </button>
     </div>
@@ -541,52 +536,48 @@
       <div class="layout--btn-group">
         <button
           class="zoomButton-up btn-lg no-select"
-          id="layoutTitleUp"
-        >
+          id="layoutTitleUp">
         <svg id="Group_304" data-name="Group 304" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
           <g id="Rectangle_1072" data-name="Rectangle 1072" fill="none" stroke="#f1f9ff" stroke-width="2">
-            <rect width="30" height="30" rx="10" stroke="none"/>
-            <rect x="1" y="1" width="28" height="28" rx="9" fill="none"/>
+            <rect width="30" height="30" rx="10" stroke="none" />
+            <rect x="1" y="1" width="28" height="28" rx="9" fill="none" />
           </g>
-          <path id="Path_36" data-name="Path 36" d="M4.7,6.1,0,1.4,1.4,0,4.7,3.3,8,0,9.4,1.4Z" transform="translate(19.4 17.755) rotate(180)" fill="#fff"/>
+          <path id="Path_36" data-name="Path 36" d="M4.7,6.1,0,1.4,1.4,0,4.7,3.3,8,0,9.4,1.4Z" transform="translate(19.4 17.755) rotate(180)" fill="#fff" />
         </svg>
 
       </button>
         <button
           class="zoomButton-down btn-lg no-select"
-          id="layoutTitleDown"
-        >
+          id="layoutTitleDown">
         <svg id="Group_305" data-name="Group 305" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
           <g id="Rectangle_1072" data-name="Rectangle 1072" fill="none" stroke="#f1f9ff" stroke-width="2">
-            <rect width="30" height="30" rx="10" stroke="none"/>
-            <rect x="1" y="1" width="28" height="28" rx="9" fill="none"/>
+            <rect width="30" height="30" rx="10" stroke="none" />
+            <rect x="1" y="1" width="28" height="28" rx="9" fill="none" />
           </g>
-          <path id="Path_36" data-name="Path 36" d="M4.7,6.1,0,1.4,1.4,0,4.7,3.3,8,0,9.4,1.4Z" transform="translate(10 11.655)" fill="#fff"/>
+          <path id="Path_36" data-name="Path 36" d="M4.7,6.1,0,1.4,1.4,0,4.7,3.3,8,0,9.4,1.4Z" transform="translate(10 11.655)" fill="#fff" />
         </svg>
 
       </button>
         <button
           class="zoomButton-left btn-lg no-select"
-          id="layoutTitleLeft"
-        >
+          id="layoutTitleLeft">
         <svg id="Group_306" data-name="Group 306" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
           <g id="Rectangle_1072" data-name="Rectangle 1072" fill="none" stroke="#f1f9ff" stroke-width="2">
-            <rect width="30" height="30" rx="10" stroke="none"/>
-            <rect x="1" y="1" width="28" height="28" rx="9" fill="none"/>
+            <rect width="30" height="30" rx="10" stroke="none" />
+            <rect x="1" y="1" width="28" height="28" rx="9" fill="none" />
           </g>
-          <path id="Path_36" data-name="Path 36" d="M4.7,6.1,0,1.4,1.4,0,4.7,3.3,8,0,9.4,1.4Z" transform="translate(18.1 9.655) rotate(90)" fill="#fff"/>
+          <path id="Path_36" data-name="Path 36" d="M4.7,6.1,0,1.4,1.4,0,4.7,3.3,8,0,9.4,1.4Z" transform="translate(18.1 9.655) rotate(90)" fill="#fff" />
         </svg>
         </button>
         <button
           class="zoomButton-right btn-lg no-select"
-          id="layoutTitleRight"
-        >
+          id="layoutTitleRight">
         <svg id="Group_307" data-name="Group 307" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
           <g id="Rectangle_1072" data-name="Rectangle 1072" fill="none" stroke="#f1f9ff" stroke-width="2">
-            <rect width="30" height="30" rx="10" stroke="none"/>
-            <rect x="1" y="1" width="28" height="28" rx="9" fill="none"/>
+            <rect width="30" height="30" rx="10" stroke="none" />
+            <rect x="1" y="1" width="28" height="28" rx="9" fill="none" />
           </g>
-          <path id="Path_36" data-name="Path 36" d="M4.7,6.1,0,1.4,1.4,0,4.7,3.3,8,0,9.4,1.4Z" transform="translate(12 19.055) rotate(-90)" fill="#fff"/>
+          <path id="Path_36" data-name="Path 36" d="M4.7,6.1,0,1.4,1.4,0,4.7,3.3,8,0,9.4,1.4Z" transform="translate(12 19.055) rotate(-90)" fill="#fff" />
         </svg>
       </button>
     </div>
@@ -597,100 +588,74 @@
         <input
           type="checkbox"
           checked
-          id="toggleLayoutTitle"
-        />
+          id="toggleLayoutTitle">
         <span class="slider"></span>
       </label>
     </div>
     <div class="">
       <button
         class="Layout-btn custom-btn--primary"
-        id="saveLayout"
-      >
+        id="saveLayout">
         Save
       </button>
 
       <button
         class="Layout-btn custom-btn--tertiary"
-        id="cancelLayout"
-      >
+        id="cancelLayout">
         Cancel
       </button>
     </div>
   </div>
 </div>
-<div id="saveImageDialog"  class="noSelect" style="display: none;" title="Render Image">
+<div id="saveImageDialog" class="noSelect" style="display: none;" title="Render Image">
   <div class="download-dialog-section-1">
-    <label class="option custom-radio inline"
-      ><input
+    <label class="option custom-radio inline"><input
         type="radio"
         name="imgType"
         value="png"
-        checked="checked" />PNG<span></span
-    ></label>
-    <label class="option custom-radio inline"
-      ><input type="radio" name="imgType" value="jpeg" />JPEG<span></span
-    ></label>
-    <label class="option custom-radio inline"
-      ><input type="radio" name="imgType" value="svg" />SVG<span></span
-    ></label>
-    <label class="option custom-radio inline"
-      ><input type="radio" name="imgType" value="bmp" />BMP<span></span
-    ></label>
-    <label class="option custom-radio inline"
-      ><input type="radio" name="imgType" value="gif" />GIF<span></span
-    ></label>
-    <label class="option custom-radio inline"
-      ><input type="radio" name="imgType" value="tiff" />TIFF<span></span
-    ></label>
+        checked="checked">PNG<span></span></label>
+    <label class="option custom-radio inline"><input type="radio" name="imgType" value="jpeg">JPEG<span></span></label>
+    <label class="option custom-radio inline"><input type="radio" name="imgType" value="svg">SVG<span></span></label>
+    <label class="option custom-radio inline"><input type="radio" name="imgType" value="bmp">BMP<span></span></label>
+    <label class="option custom-radio inline"><input type="radio" name="imgType" value="gif">GIF<span></span></label>
+    <label class="option custom-radio inline"><input type="radio" name="imgType" value="tiff">TIFF<span></span></label>
   </div>
   <div class="download-dialog-section-2">
     <div
       class="option inline btn-group btn-group-toggle"
       style="border: none;"
-      data-toggle="buttons"
-    >
+      data-toggle="buttons">
       <div class="btn" id="radio-full" role="button">
-        <input type="radio" name="view" value="full" /> Full Circuit View
+        <input type="radio" name="view" value="full"> Full Circuit View
       </div>
       <div class="btn active" id="radio-current" role="button">
         <input
           type="radio"
           name="view"
           value="current"
-          checked="checked"
-        />Current View
+          checked="checked">Current View
       </div>
     </div>
     <div class="download-dialog-section-2_2">
-      <label class="cb-checkbox"
-        ><input
+      <label class="cb-checkbox"><input
           type="checkbox"
           name="transparent"
-          value="transparent"
-        />Transparent Background</label
-      >
+          value="transparent">Transparent Background</label>
     </div>
   </div>
   <div class="download-dialog-section-3">
     <span>Resolution:</span>
-    <label class="option custom-radio inline"
-      ><input
+    <label class="option custom-radio inline"><input
         type="radio"
         name="resolution"
         value="1"
-        checked="checked" />1x<span></span
-    ></label>
-    <label class="option custom-radio inline"
-      ><input type="radio" name="resolution" value="2" />2x<span></span
-    ></label>
-    <label class="option custom-radio inline"
-      ><input type="radio" name="resolution" value="4" />4x<span></span
-    ></label>
+        checked="checked">1x<span></span></label>
+    <label class="option custom-radio inline"><input type="radio" name="resolution" value="2">2x<span></span></label>
+    <label class="option custom-radio inline"><input type="radio" name="resolution" value="4">4x<span></span></label>
   </div>
 </div>
 
-<div id="colorThemesDialog" class='customScroll colorThemesDialog' tabindex = "0" style="display: none;" title="Select Theme"></div>
+<div id="colorThemesDialog" class='customScroll colorThemesDialog' tabindex="0" style="display: none;" title="Select Theme"></div>
 <div id="CustomColorThemesDialog" class='customScroll' tabindex="0" style="display: none;" title="Custom Theme"></div>
 <input type='file' id="importThemeFile" name='themeFile' style="display:none" multiple>
 
@@ -715,8 +680,7 @@
         z-index: 0;
         width: 100%;
         height: 100%;
-      "
-    ></canvas>
+      "></canvas>
     <canvas
       id="simulationArea"
       style="
@@ -726,13 +690,11 @@
         z-index: 1;
         width: 100%;
         height: 100%;
-      "
-    ></canvas>
+      "></canvas>
     <div id="miniMap">
       <canvas
         id="miniMapArea"
-        style="position: absolute; left: 0; top: 0; z-index: 3;"
-      ></canvas>
+        style="position: absolute; left: 0; top: 0; z-index: 3;"></canvas>
     </div>
     <div id="contextMenu" oncontextmenu="return false;">
       <ul>
@@ -755,8 +717,7 @@
         right: 50%;
         bottom: 50%;
         z-index: 100;
-      "
-    >
+      ">
       <div class="sk-cube1 sk-cube"></div>
       <div class="sk-cube2 sk-cube"></div>
       <div class="sk-cube4 sk-cube"></div>
@@ -770,43 +731,37 @@
   class='customScroll'
   tabindex="0"
   style="display: none;"
-  title="Export as file"
-></div>
+  title="Export as file"></div>
 <div
   id="ImportCircuitFilesDialog"
   class='customScroll'
   tabindex="0"
   style="display: none;"
-  title="Import as file"
-></div>
+  title="Import as file"></div>
 <div
   id="combinationalAnalysis"
   style="display: none;"
-  title="BooleanLogicTable"
-></div>
+  title="BooleanLogicTable"></div>
 <div
   id="setTestbenchData"
   style="display: none;"
-  title="Create Test"
-></div>
+  title="Create Test"></div>
 <div
   id="testbenchValidate"
   style="display: none;"
-  title="Testbench Validation"
-></div>
+  title="Testbench Validation"></div>
 <div
   id="insertSubcircuitDialog"
   class="subcircuitdialog"
-  title="Insert SubCircuit"
-></div>
+  title="Insert SubCircuit"></div>
 <div id="insertSubcircuitcontent"><span><p>Looks like there are no other circuits which doesn't have this circuit as a dependency. Create a new one!</p></span><a class="btn btn-xs custom-btn--primary dropdown-item text-center logixButton pl-1" id="newCircuit">New Circuit +</a></div>
 <div id="openProjectDialog" style="display: none;" title="Open Project"></div>
 <div id="bitconverterprompt" title="Dec-Bin-Hex-Converter" style="display: none;">
-    <label >Decimal value</label><br><input  type='text' id='decimalInput' value='16' label="Decimal" name='text1'><br><br>
-    <label >Binary value</label><br><input  type='text' id='binaryInput'  value='0b10000' label="Binary" name='text1'><br><br>
-    <label >Binary-coded decimal value</label><br><input  type='text' id='bcdInput'  value='10110' label="BCD" name='text1'><br><br>
-    <label >Octal value</label><br><input  type='text' id='octalInput' value='020' label="Octal" name='text1'><br><br>
-    <label >Hexadecimal value</label><br><input  type='text' id='hexInput' value='0x10' label="Hex" name='text1'><br><br>
+    <label>Decimal value</label><br><input type='text' id='decimalInput' value='16' label="Decimal" name='text1'><br><br>
+    <label>Binary value</label><br><input type='text' id='binaryInput' value='0b10000' label="Binary" name='text1'><br><br>
+    <label>Binary-coded decimal value</label><br><input type='text' id='bcdInput' value='10110' label="BCD" name='text1'><br><br>
+    <label>Octal value</label><br><input type='text' id='octalInput' value='020' label="Octal" name='text1'><br><br>
+    <label>Hexadecimal value</label><br><input type='text' id='hexInput' value='0x10' label="Hex" name='text1'><br><br>
 </div>
 <!---issue reporting-system----->
 <div class="report-sidebar">
@@ -814,10 +769,8 @@
     type="button"
     class="btn btn-primary text-light"
     data-toggle="modal"
-    data-target=".issue"
-  >
-    <span class="fa fa-bug"></span>&nbsp;&nbsp;Report an issue</a
-  >
+    data-target=".issue">
+    <span class="fa fa-bug"></span>&nbsp;&nbsp;Report an issue</a>
 </div>
 
 <!---issue reporting system-modal---->
@@ -826,8 +779,7 @@
   tabindex="-1"
   role="dialog"
   aria-labelledby="mySmallModalLabel"
-  aria-hidden="true"
->
+  aria-hidden="true">
   <div class="modal-dialog modal-sm">
     <div class="modal-content">
       <div class="container my-2">
@@ -835,28 +787,24 @@
           type="button"
           class="close"
           data-dismiss="modal"
-          aria-label="Close"
-        >
+          aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
         <div class="container text-center">
           <h4>Report an issue</h4>
         </div>
-        <hr />
+        <hr>
         <div class="container my-2 text-center" id="result"></div>
-        <label id="report-label" style="font-weight: lighter;"
-          ><b>Describe your issue:</b></label
-        >
+        <label id="report-label" style="font-weight: lighter;"><b>Describe your issue:</b></label>
         <div class="form-group">
           <textarea
             class="form-control border-primary"
             id="issuetext"
-            rows="3"
-          ></textarea>
+            rows="3"></textarea>
         </div>
         <label for="emailtext" id="email-label" style="font-weight: lighter"><b>Email</b><span> [Optional]</span>:</label>
         <div class="form-group">
-          <input class="form-control border-primary"  type="email" id="emailtext" rows="3"/>
+          <input class="form-control border-primary" type="email" id="emailtext" rows="3">
         </div>
         <div class="container">
           <center>
@@ -890,10 +838,10 @@ if(restricted_feature.includes('Verilog tools')) {
 
 <script>
   const embed = false;
-  user_id = "<%= user_signed_in? ? " #{current_user.id.to_s} - #{current_user.name}" : "Guest user" %>";
+  user_id = "<%= user_signed_in? ? " #{current_user.id} - #{current_user.name}" : "Guest user" %>";
   var listenToSimulator=true
   <% if @project&.assignment_id.present? %>
-  restrictedElements = JSON.parse('<%= raw @project&.assignment.clean_restricted_elements %>');
+  restrictedElements = JSON.parse('<%= raw @project&.assignment&.clean_restricted_elements %>');
   <% else %>
   restrictedElements = [];
   <% end %>
@@ -922,9 +870,5 @@ $("#openProjectDialog").checkBo();
 $(".download-dialog-section-2_2").checkBo();
 });
 
-
-function old_ui_redirect() {
-  window.location.href = window.location.href.replace("/simulator", "/simulator_old")
-}
 </script>
 <script src="/js/data.js"></script>
diff --git a/app/views/simulator/embed.html.erb b/app/views/simulator/embed.html.erb
index 03c128b9be..318ab9934f 100644
--- a/app/views/simulator/embed.html.erb
+++ b/app/views/simulator/embed.html.erb
@@ -11,10 +11,10 @@
             <div> <span style="font-style: italic"> Restricted elements used: </span> <span id="restrictedElementsDiv--list"> </span></div>
           </div>
         <% end %>
-        <div id="MessageDiv" >
+        <div id="MessageDiv">
         </div>
 
-        <div class="canvasArea" id="canvasArea"  style="height:100%;width:100%">
+        <div class="canvasArea" id="canvasArea" style="height:100%;width:100%">
             <canvas id="backgroundArea" style="position: absolute; left: 0; top: 0; z-index: 0"></canvas>
             <canvas id="simulationArea" style="position: absolute; left: 0; top: 0; z-index: 1; width:100%;height:100%"></canvas>
         </div>
@@ -34,7 +34,7 @@
       </div>
 
       <div style="position:absolute; right:10px; top:25px; z-index:100" class="clockPropertyHeader noSelect">
-        <div id ="clockProperty" >
+        <div id="clockProperty">
         </div>
       </div>
       <div class="sk-folding-cube loadingIcon" style="display:inline-block;position:absolute; right:50%; bottom:50%; z-index:100">
@@ -58,7 +58,7 @@
               font-size: 12px;
               color: grey;
               z-index: 2;"
-             href= "/users/<%=@author%>/projects/<%=@logix_project_id%>"
+             href="/users/<%= @author %>/projects/<%= @logix_project_id %>"
              target="_blank">
             Made With CircuitVerse
           </a>
@@ -71,7 +71,7 @@
     __logix_project_id = "<%= @logix_project_id %>";
         embed=true;
         <% if @project&.assignment_id.present? %>
-          restrictedElements = JSON.parse('<%= raw @project&.assignment.clean_restricted_elements %>');
+          restrictedElements = JSON.parse('<%= raw @project&.assignment&.clean_restricted_elements %>');
         <% else %>
           restrictedElements = [];
         <% end %>
diff --git a/app/views/testbench/creator.html.erb b/app/views/testbench/creator.html.erb
index ac291cfdf9..2e2dbb9859 100644
--- a/app/views/testbench/creator.html.erb
+++ b/app/views/testbench/creator.html.erb
@@ -38,7 +38,7 @@
             <div style="float: right; display: inline-block;" class="right-button-group">
                 <button class="lower-button" onclick="clickUpload();">Import from CSV</button>
                 <button class="lower-button" onclick="exportAsCSV();">Export as CSV</button>
-                <input id='csvFileInput' type='file' accept=".csv" onchange="importFromCSV()" hidden/>
+                <input id='csvFileInput' type='file' accept=".csv" onchange="importFromCSV()" hidden>
             </div>
     </div>
 
diff --git a/app/views/user_mailer/forked_project_email.html.erb b/app/views/user_mailer/forked_project_email.html.erb
index 6bc864ed84..8f3be8064e 100644
--- a/app/views/user_mailer/forked_project_email.html.erb
+++ b/app/views/user_mailer/forked_project_email.html.erb
@@ -1,7 +1,7 @@
 <div>
   <h2>Welcome to CircuitVerse, <%= @user.name %></h2>
   <%= inline_svg_tag "SVGs/newProject.svg", alt: "New Project", class: "mailer-assignment-image" %>
-  <p class="mailer-text">You have successfully forked a new project from <span class="mailer-highlighted-text"><%= @old_project.author.name + "/" + @old_project.name %></span>. <br>
+  <p class="mailer-text">You have successfully forked a new project from <span class="mailer-highlighted-text"><%= "#{@old_project.author.name}/#{@old_project.name}" %></span>. <br>
     Your forked project name is: <span class="mailer-highlighted-text"><%= @new_project.name %></span> with an access type: <span class="mailer-highlighted-text"><%= @new_project.project_access_type %></span>.
   </p>
   <a href="<%= user_project_url(@user, @new_project) %>" class="mailer-button">View Project</a>
diff --git a/app/views/users/circuitverse/_dashboard.html.erb b/app/views/users/circuitverse/_dashboard.html.erb
index 0d0b274389..f311044b7f 100644
--- a/app/views/users/circuitverse/_dashboard.html.erb
+++ b/app/views/users/circuitverse/_dashboard.html.erb
@@ -21,11 +21,11 @@
           <% if policy(project).user_access? %>
             <a href="<%= simulator_edit_path(project) %>" class="btn primary-button" target="_blank"><%= t("launch") %></a>
           <% else %>
-              <%= link_to create_fork_project_path(project), class: "btn primary-button", target: "_blank", method: :post do %>
+              <%= link_to create_fork_project_path(project), class: "btn primary-button", target: "_blank", method: :post, rel: "noopener" do %>
               <span><%= t("fork") %></span>
             <% end %>
           <% end %>
-            <%= link_to t("view"), '#', class: "previewButton btn primary-button", data: {toggle: "modal", target: "#projectModal", currentproject: project} %>
+            <%= link_to t("view"), "#", class: "previewButton btn primary-button", data: { toggle: "modal", target: "#projectModal", currentproject: project } %>
             <a href="<%= user_project_path(project.author_id, project) %>" class="btn primary-button" target="_blank"><%= t("more") %></a>
         </div>
       </div>
diff --git a/app/views/users/circuitverse/_delete_group_confirmation_modal.html.erb b/app/views/users/circuitverse/_delete_group_confirmation_modal.html.erb
index d2f5fe79cb..6451689f9a 100644
--- a/app/views/users/circuitverse/_delete_group_confirmation_modal.html.erb
+++ b/app/views/users/circuitverse/_delete_group_confirmation_modal.html.erb
@@ -9,7 +9,7 @@
         <p><%= t("users.circuitverse.delete_group_confirmation") %></p>
       </div>
       <div class="modal-footer">
-        <%= link_to '#', method: :delete, class: "btn primary-delete-button", id: "groups-group-delete-button" do %>
+        <%= link_to "#", method: :delete, class: "btn primary-delete-button", id: "groups-group-delete-button" do %>
           <%= t("delete") %>
         <% end %>
       </div>
diff --git a/app/views/users/circuitverse/_delete_user_confirmation_modal.html.erb b/app/views/users/circuitverse/_delete_user_confirmation_modal.html.erb
index 0d05014df0..58ff09999e 100644
--- a/app/views/users/circuitverse/_delete_user_confirmation_modal.html.erb
+++ b/app/views/users/circuitverse/_delete_user_confirmation_modal.html.erb
@@ -9,7 +9,7 @@
         <p><%= t("users.circuitverse.delete_user_confirmation") %></p>
       </div>
       <div class="modal-footer">
-        <%= link_to '#', method: :delete, class: "btn primary-delete-button", id: "users-user-delete-button" do %>
+        <%= link_to "#", method: :delete, class: "btn primary-delete-button", id: "users-user-delete-button" do %>
           <%= t("delete") %>
         <% end %>
       </div>
diff --git a/app/views/users/circuitverse/_view_project_modal.html.erb b/app/views/users/circuitverse/_view_project_modal.html.erb
index 4b0f5190fb..2269fe69c5 100644
--- a/app/views/users/circuitverse/_view_project_modal.html.erb
+++ b/app/views/users/circuitverse/_view_project_modal.html.erb
@@ -11,8 +11,8 @@
         </div>
       </div>
       <div class="modal-footer">
-        <%= link_to t("fork"), '#', class: "btn primary-button", id: "project-fork-button", method: :post %>
-        <%= link_to t("more"), '#', class: "btn primary-button", id: "project-more-button", target: "_blank" %>
+        <%= link_to t("fork"), "#", class: "btn primary-button", id: "project-fork-button", method: :post %>
+        <%= link_to t("more"), "#", class: "btn primary-button", id: "project-more-button", target: "_blank", rel: "noopener" %>
       </div>
     </div>
   </div>
diff --git a/app/views/users/circuitverse/edit.html.erb b/app/views/users/circuitverse/edit.html.erb
index 0220c29a8f..f330b6cc88 100644
--- a/app/views/users/circuitverse/edit.html.erb
+++ b/app/views/users/circuitverse/edit.html.erb
@@ -1,5 +1,5 @@
 
-<% content_for :title, t("users.circuitverse.edit_profile.title", name: @profile.name ) %>
+<% content_for :title, t("users.circuitverse.edit_profile.title", name: @profile.name) %>
 
 <div class="container projects-new-container">
   <div class="row center-row">
@@ -14,27 +14,27 @@
         <%= form_with model: @profile, multipart: true, url: { action: "update" }, local: true do |f| %>
           <div class="field form-group">
             <h6><%= f.label :name %><sup><i class="fa fa-asterisk users-edit-asterisk"></i></sup></h6>
-            <%= f.text_field :name, required: true, class:"form-control form-input", autofocus: true %>
+            <%= f.text_field :name, required: true, class: "form-control form-input", autofocus: true %>
           </div>
           <div class="field form-group">
             <h6><%= t("users.circuitverse.edit_profile.profile_picture") %><h6>
-            <p><%= image_tag @profile.profile_picture.url(:thumb), id:'imgedit', class:"users-edit-image", alt:'User Profile Image' %></p>
+            <p><%= image_tag @profile.profile_picture.url(:thumb), id: "imgedit", class: "users-edit-image", alt: "User Profile Image" %></p>
             <label for="profile_picture" class="users-edit-image-button"><%= t("users.circuitverse.edit_profile.choose_file") %></label>
             <input tabindex="0" type="file" accept="image/png, .jpeg, .jpg" class="users-edit-image-button-hidden" id="profile_picture" name="user[profile_picture]" onchange="readURL(this);" value="<%= @profile.profile_picture %>">
-            <%= f.check_box :remove_picture, id: "remove_pic", class:"remove-pic" %>
+            <%= f.check_box :remove_picture, id: "remove_pic", class: "remove-pic" %>
             <label for="remove_pic" class="users-remove-image-button"><%= t("users.circuitverse.edit_profile.remove_picture") %></label>
           </div>
           <div class="field form-group">
             <h6><%= f.label :country %></h6>
-            <%= f.country_select :country, { include_blank: t("users.circuitverse.edit_profile.country_select_placeholder"), priority_countries: get_priority_countries() }, class: "form-control form-input" %>
+            <%= f.country_select :country, { include_blank: t("users.circuitverse.edit_profile.country_select_placeholder"), priority_countries: get_priority_countries }, class: "form-control form-input" %>
           </div>
           <div class="field form-group">
             <h6><%= f.label :educational_institute %></h6>
-            <%= f.text_field :educational_institute, { class: "autocomplete form-control form-input", autocomplete:"off" } %>
+            <%= f.text_field :educational_institute, { class: "autocomplete form-control form-input", autocomplete: "off" } %>
           </div>
           <div class="field form-group">
             <h6><%= f.label :locale %></h6>
-            <%= f.select :locale, options_for_select(I18nSupport.locale_names, f.object.locale), { prompt: t("users.circuitverse.edit_profile.select_locale_prompt") }, { class: 'form-control form-input' } %>
+            <%= f.select :locale, options_for_select(I18nSupport.locale_names, f.object.locale), { prompt: t("users.circuitverse.edit_profile.select_locale_prompt") }, { class: "form-control form-input" } %>
           </div>
           <div class="field form-group users-edit-primary-checkpoint">
             <label for="profile_subscribed" class="primary-checkpoint-container"><h6><%= t("users.circuitverse.edit_profile.subscribe_mail_checkpoint") %></h6>
@@ -51,7 +51,7 @@
             <p><%= t("users.circuitverse.edit_profile.delete_account_notice") %></p> <br>
           </div>
         </div>
-        <%= link_to  t("users.circuitverse.edit_profile.delete_account"), "#", class: "btn primary-delete-button", data: {toggle: "modal", target: "#deleteuserModal", currentuser: @profile.id} %>
+        <%= link_to t("users.circuitverse.edit_profile.delete_account"), "#", class: "btn primary-delete-button", data: { toggle: "modal", target: "#deleteuserModal", currentuser: @profile.id } %>
       </div>
     </div>
   </div>
diff --git a/app/views/users/circuitverse/groups.html.erb b/app/views/users/circuitverse/groups.html.erb
index e43e1f56eb..3f1cf5cd37 100644
--- a/app/views/users/circuitverse/groups.html.erb
+++ b/app/views/users/circuitverse/groups.html.erb
@@ -4,7 +4,6 @@
   <% content_for :title, t("users.circuitverse.groups.alt_title") %>
 <% end %>
 
-
 <div class="container">
   <% if notice %>
   <div class="row" id='alertdiv'>
@@ -29,7 +28,7 @@
           <div class="groups-card groups-mentor-card">
             <div class="groups-mentor-card-name"><%= group.name %></div>
             <div>
-              <p><%= t("users.circuitverse.groups.total_members",group_member_count: group.group_member_count ) %> </p>
+              <p><%= t("users.circuitverse.groups.total_members", group_member_count: group.group_member_count) %> </p>
             </div>
             <div class="groups-mentor-card-mini-buttons">
               <%= link_to group, class: "mini-button groups-mentor-card-view-mini-button" do %>
@@ -40,7 +39,7 @@
                 <%= image_tag("SVGs/editGroup.svg", alt: "Edit Group") %>
                 <span><%= t("edit") %></span>
               <% end %>
-              <%= link_to '#', class: "mini-button groups-mentor-card-delete-mini-button", data: {toggle: "modal", target: "#deletegroupModal", currentgroup: group.id} do %>
+              <%= link_to "#", class: "mini-button groups-mentor-card-delete-mini-button", data: { toggle: "modal", target: "#deletegroupModal", currentgroup: group.id } do %>
                 <%= image_tag("SVGs/deleteGroup.svg", alt: "Delete Group") %>
                 <span><%= t("delete") %></span>
               <% end %>
diff --git a/app/views/users/circuitverse/index.html.erb b/app/views/users/circuitverse/index.html.erb
index 507f88b414..ded4a73e22 100644
--- a/app/views/users/circuitverse/index.html.erb
+++ b/app/views/users/circuitverse/index.html.erb
@@ -7,19 +7,19 @@
 <% end %>
 
 <% set_meta_tags twitter: {
-  card: "summary_large_image",
-  title: yield(:title),
-  image: {
-    src: "#{Rails.configuration.site_url}img/circuitverseBanner2.png"
-  }
-} %>
+     card: "summary_large_image",
+     title: yield(:title),
+     image: {
+       src: "#{Rails.configuration.site_url}img/circuitverseBanner2.png"
+     }
+   } %>
 
 <% set_meta_tags og: {
-  title: yield(:title),
-  image: "#{Rails.configuration.site_url}img/circuitverseBanner2.png",
-  type: "article",
-  site_name: Rails.configuration.site_name
-} %>
+     title: yield(:title),
+     image: "#{Rails.configuration.site_url}img/circuitverseBanner2.png",
+     type: "article",
+     site_name: Rails.configuration.site_name
+   } %>
 
 <div class="container">
   <% if notice %>
@@ -41,7 +41,7 @@
         <h4 class="users-user-name"><%= @profile.name %></h4>
         <div class="search-userdetails-container">
           <p class="search-user-details-text"><%= t("users.circuitverse.member_since_html", member_since: @profile.member_since) %></p>
-          <p class="search-user-details-text"><%= t("users.circuitverse.educational_institutes_html",educational_institute: @profile.educational_institute) %></p>
+          <p class="search-user-details-text"><%= t("users.circuitverse.educational_institutes_html", educational_institute: @profile.educational_institute) %></p>
           <p class="search-user-details-text"><%= t("users.circuitverse.country_html", country_name: @profile.country_name) %></p>
           <% if policy(@user).edit? %>
             <a class="btn primary-button" href="<%= profile_edit_path(current_user) %>"><%= t("users.circuitverse.index.edit_details") %></a>
@@ -69,14 +69,14 @@
         <div class="search-no-results-image">
           <%= image_tag "SVGs/noProject.svg", alt: "No result image" %>
           <% if current_user == @user %>
-            <h6><%= t("users.circuitverse.index.no_projects_heading_html", simulator_new_url: link_to(t("users.circuitverse.index.create_here"), simulator_new_url, class: 'anchor-text')) %></h6>
+            <h6><%= t("users.circuitverse.index.no_projects_heading_html", simulator_new_url: link_to(t("users.circuitverse.index.create_here"), simulator_new_url, class: "anchor-text")) %></h6>
           <% else %>
-            <h6><%= t("users.circuitverse.index.no_user_projects", name: @user.name ) %></h6>
+            <h6><%= t("users.circuitverse.index.no_user_projects", name: @user.name) %></h6>
           <% end %>
         </div>
       </div>
       <% else %>
-        <%= render partial: "dashboard" , locals: {projects: @user.projects} %>
+        <%= render partial: "dashboard", locals: { projects: @user.projects } %>
       <% end %>
     </div>
     <div id="favourite-circuits-div" class="row center-row circuit-page">
@@ -85,14 +85,14 @@
           <div class="search-no-results-image">
             <%= image_tag "SVGs/noProject.svg", alt: "No result image" %>
             <% if current_user == @user %>
-              <h6><%= t("users.circuitverse.index.no_favourites_heading_html", simulator_new_url: link_to(t("users.circuitverse.index.create_here"), simulator_new_url, class: 'anchor-text')) %></h6>
+              <h6><%= t("users.circuitverse.index.no_favourites_heading_html", simulator_new_url: link_to(t("users.circuitverse.index.create_here"), simulator_new_url, class: "anchor-text")) %></h6>
             <% else %>
-              <h6><%= t("users.circuitverse.index.no_user_favourites", name: @user.name ) %></h6>
+              <h6><%= t("users.circuitverse.index.no_user_favourites", name: @user.name) %></h6>
             <% end %>
           </div>
         </div>
       <% else %>
-        <%= render partial: "dashboard" , locals: {projects: @projects} %>
+        <%= render partial: "dashboard", locals: { projects: @projects } %>
       <% end %>
     </div>
     <div id="collaborator-circuits-div" class="row center-row circuit-page">
@@ -104,12 +104,12 @@
             <% if current_user == @user %>
               <h6><%= t("users.circuitverse.index.not_a_collaborator") %></h6>
             <% else %>
-              <h6><%= t("users.circuitverse.index.user_not_a_collaborator", name: @user.name ) %></h6>
+              <h6><%= t("users.circuitverse.index.user_not_a_collaborator", name: @user.name) %></h6>
             <% end %>
           </div>
         </div>
       <% else %>
-        <%= render partial: "dashboard" , locals: {projects: collaborated_projects} %>
+        <%= render partial: "dashboard", locals: { projects: collaborated_projects } %>
       <% end %>
     </div>
 
@@ -159,7 +159,7 @@
   };
 
   const fuse = new Fuse(projectList, options);
-  
+
   // on key up
   $('.users-circuits-search').keyup(() => {
     const searchQuery = $('.users-circuits-search').val().toLowerCase().trim();
diff --git a/app/views/users/circuitverse/search.html.erb b/app/views/users/circuitverse/search.html.erb
index 4694308e26..3539b0d802 100644
--- a/app/views/users/circuitverse/search.html.erb
+++ b/app/views/users/circuitverse/search.html.erb
@@ -21,7 +21,7 @@
         </div>
         <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7 search-userdetails-container">
           <p class="search-user-details-text"><%= t("users.circuitverse.member_since_html", member_since: profile.member_since) %></p>
-          <p class="search-user-details-text"><%= t("users.circuitverse.educational_institutes_html",educational_institute: profile.educational_institute) %></p>
+          <p class="search-user-details-text"><%= t("users.circuitverse.educational_institutes_html", educational_institute: profile.educational_institute) %></p>
           <p class="search-user-details-text"><%= t("users.circuitverse.country_html", country_name: profile.country_name) %></p>
           <p class="search-user-details-text"><%= t("users.circuitverse.total_circuits_made_html", total_circuits: profile.total_circuits) %></p>
           <a class="btn primary-button search-user-primary-button" target="_blank" href="<%= user_path(profile) %>"><%= t("view") %></a>
diff --git a/app/views/users/confirmations/new.html.erb b/app/views/users/confirmations/new.html.erb
index 2f73e84828..97e243ae01 100644
--- a/app/views/users/confirmations/new.html.erb
+++ b/app/views/users/confirmations/new.html.erb
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 center-image">
-      <%= image_tag "SVGs/login.svg", alt: "Login Logo", :class => "users-image" %>
+      <%= image_tag "SVGs/login.svg", alt: "Login Logo", class: "users-image" %>
       <h5 class="users-image-text"><%= t("welcome_back_text") %></h5>
     </div>
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
@@ -12,7 +12,7 @@
           <div class="field form-group">
             <h6><%= f.label :email %></h6>
             <div class="input-group">
-              <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), class:"form-control form-input" %>
+              <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), class: "form-control form-input" %>
             </div>
           </div>
           <div class="field form-group">
diff --git a/app/views/users/noticed_notifications/index.html.erb b/app/views/users/noticed_notifications/index.html.erb
index 7d613565ac..93edb838cc 100644
--- a/app/views/users/noticed_notifications/index.html.erb
+++ b/app/views/users/noticed_notifications/index.html.erb
@@ -13,13 +13,13 @@
     </div>
     <% if @unread.count.positive? %>
       <div>
-        <%= link_to t("users.notifications.mark_as_read_button"), mark_all_as_read_url(current_user), :method=> :patch, class: "anchor-text" %>
+        <%= link_to t("users.notifications.mark_as_read_button"), mark_all_as_read_url(current_user), method: :patch, class: "anchor-text" %>
       </div>
     <% end %>
   </div>
   <div id="all-notifications-div" class="d-flex flex-column bd-highlight mb-10 mt-3 notifications_container">
     <% @notifications.each do |notification| %>
-      <%= link_to mark_as_read_path(id: current_user, notification_id: notification.id), method: :post, class: 'mb-2 mt-2 notification' do %>
+      <%= link_to mark_as_read_path(id: current_user, notification_id: notification.id), method: :post, class: "mb-2 mt-2 notification" do %>
         <div class="d-flex align-items-center notification-div">
           <span><i class="<%= notification.to_notification.icon %>"></i></span>
           <div class="d-flex flex-column message-wrapper">
@@ -49,7 +49,7 @@
   <div id="unread-notifications-div" class="d-none flex-column bd-highlight mb-3 mt-3 notifications_container">
     <% @unread.each do |notification| %>
       <% if notification.unread? %>
-        <%= link_to mark_as_read_path(id: current_user, notification_id: notification.id), method: :post, class: 'mb-2 mt-2 notification' do %>
+        <%= link_to mark_as_read_path(id: current_user, notification_id: notification.id), method: :post, class: "mb-2 mt-2 notification" do %>
           <div class="d-flex align-items-center">
             <span><i class="<%= notification.to_notification.icon %>"></i></span>
             <div class="d-flex flex-column message_wrapper">
diff --git a/app/views/users/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb
index 66c4eed25e..caa26f27ec 100644
--- a/app/views/users/passwords/edit.html.erb
+++ b/app/views/users/passwords/edit.html.erb
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 center-image">
-      <%= image_tag "SVGs/login.svg", alt: "Login Sketch", :class => "users-image" %>
+      <%= image_tag "SVGs/login.svg", alt: "Login Sketch", class: "users-image" %>
       <h5 class="users-image-text"><%= t("welcome_back_text") %></h5>
     </div>
 
@@ -23,29 +23,29 @@
             <h6>
               <%= f.label :password %>
               <% if @minimum_password_length %>
-                <%= t("users.minimum_password_length", minimum_password_length: @minimum_password_length ) %>
+                <%= t("users.minimum_password_length", minimum_password_length: @minimum_password_length) %>
               <% end %>
             </h6>
             <div class="input-group">
-              <%= f.password_field :password, autofocus: true, autocomplete: "off", class:"form-control form-input" %>
+              <%= f.password_field :password, autofocus: true, autocomplete: "off", class: "form-control form-input" %>
             </div>
           </div>
           <div class="field form-group">
             <h6><%= f.label :password_confirmation %></h6>
             <div class="input-group">
-              <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control form-input" %>
+              <%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control form-input" %>
             </div>
           </div>
           <div class="field form-group">
             <div class="input-group">
-              <%= f.submit t("users.passwords.change_password") ,class:"btn primary-button users-primary-button" %>
+              <%= f.submit t("users.passwords.change_password"), class: "btn primary-button users-primary-button" %>
               <%= link_to t("users.passwords.link_to_login_page"), new_user_session_path, class: "anchor-text mt-2" %>
             </div>
           </div>
           <div class="field form-group">
             <div class="input-group">
               <span class="users-text"><%= t("users.ask_new_user") %></span>
-              <%= link_to t("sign_up"), new_user_registration_path, class:"anchor-text" %>
+              <%= link_to t("sign_up"), new_user_registration_path, class: "anchor-text" %>
             </div>
           </div>
           <%= render "users/shared/links" %>
diff --git a/app/views/users/passwords/new.html.erb b/app/views/users/passwords/new.html.erb
index 2331cd9103..6fe805a28e 100644
--- a/app/views/users/passwords/new.html.erb
+++ b/app/views/users/passwords/new.html.erb
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 center-image">
-      <%= image_tag "SVGs/login.svg", alt: "Login Sketch", :class => "users-image" %>
+      <%= image_tag "SVGs/login.svg", alt: "Login Sketch", class: "users-image" %>
       <h5 class="users-image-text"><%= t("welcome_back_text") %></h5>
     </div>
 
@@ -21,12 +21,12 @@
           <div class="field form-group">
             <h6><%= f.label :email %></h6>
             <div class="input-group">
-              <%= f.email_field :email, autofocus: true, class:"form-control form-input user-email-input" %>
+              <%= f.email_field :email, autofocus: true, class: "form-control form-input user-email-input" %>
             </div>
           </div>
           <div class="field form-group">
             <div class="input-group">
-              <%= f.submit t("users.passwords.send_reset_link"), class:"btn primary-button users-primary-button" %>
+              <%= f.submit t("users.passwords.send_reset_link"), class: "btn primary-button users-primary-button" %>
               <%= link_to t("users.passwords.link_to_login_page"), new_user_session_path, class: "anchor-text mt-2" %>
             </div>
           </div>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index a55508624c..176fec7736 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 center-image">
-      <%= image_tag "SVGs/signup.svg", alt: "Signup Sketch", :class => "users-image" %>
+      <%= image_tag "SVGs/signup.svg", alt: "Signup Sketch", class: "users-image" %>
       <h5><%= t("users.registrations.get_started") %></h5>
     </div>
 
@@ -22,13 +22,13 @@
         <div class="field form-group">
           <h6><%= f.label :name %></h6>
           <div class="input-group">
-            <%= f.text_field :name, autofocus: true ,class:"form-control form-input" %>
+            <%= f.text_field :name, autofocus: true, class: "form-control form-input" %>
           </div>
         </div>
         <div class="field form-group">
           <h6><%= f.label :email %></h6>
           <div class="input-group">
-            <%= f.email_field :email, class:"form-control form-input" %>
+            <%= f.email_field :email, class: "form-control form-input" %>
           </div>
         </div>
         <div class="field form-group">
@@ -39,7 +39,7 @@
             <% end %>
           </h6>
         <div class="input-group form-input">
-          <%= f.password_field :password, autocomplete: "off" ,class:"form-control users-password-input" %>
+          <%= f.password_field :password, autocomplete: "off", class: "form-control users-password-input" %>
           <div class="input-group-addon ml-3 mt-2" onclick="togglePassword()">
             <i class="far fa-eye-slash password-icon" aria-hidden="true" id="toggle-icon"></i>
           </div>
@@ -52,10 +52,10 @@
                 <%= flash[:recaptcha_error] %>
                 <%= recaptcha_tags %>
               <% end %>
-              <%= f.submit t("sign_up"), class:"btn primary-button users-login-primary-button" %>
+              <%= f.submit t("sign_up"), class: "btn primary-button users-login-primary-button" %>
               <div class="users-text-container">
                 <span class="users-text"><%= t("users.registrations.ask_already_registered") %></span>
-                <%= link_to t("login"), new_user_session_path ,class:"anchor-text" %>
+                <%= link_to t("login"), new_user_session_path, class: "anchor-text" %>
               </div>
             </div>
           </div>
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index 6621f17761..2d68991530 100644
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 center-image">
-      <%= image_tag "SVGs/login.svg", alt: "Login Sketch", :class => "users-image" %>
+      <%= image_tag "SVGs/login.svg", alt: "Login Sketch", class: "users-image" %>
       <h5><%= t("welcome_back_text") %></h5>
     </div>
 
@@ -15,13 +15,13 @@
         <div class="field form-group">
           <h6><%= f.label :email %></h6>
           <div class="input-group">
-            <%= f.email_field :email, autofocus: true, class:"form-control form-input user-email-input" %>
+            <%= f.email_field :email, autofocus: true, class: "form-control form-input user-email-input" %>
           </div>
         </div>
         <div class="field form-group">
           <h6><%= f.label :password %></h6>
           <div class="input-group form-input">
-            <%= f.password_field :password, autocomplete: "off" ,class:"form-control users-password-input" %>
+            <%= f.password_field :password, autocomplete: "off", class: "form-control users-password-input" %>
             <div class="input-group-addon ml-3 mt-2" onclick="togglePassword()">
               <i class="far fa-eye-slash password-icon" aria-hidden="true" id="toggle-icon"></i>
             </div>
@@ -30,7 +30,7 @@
         <div class="field form-group">
           <div class="input-group">
             <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-              <%= link_to t("users.sessions.forgot_password"), new_password_path(resource_name), class:"anchor-text users-forgot-password-text" %>
+              <%= link_to t("users.sessions.forgot_password"), new_password_path(resource_name), class: "anchor-text users-forgot-password-text" %>
             <% end -%>
           </div>
         </div>
@@ -47,10 +47,10 @@
             <% if Flipper.enabled?(:recaptcha) %>
               <%= recaptcha_tags %>
             <% end %>
-            <%= f.submit t('login') ,class:"btn primary-button users-login-primary-button" %>
+            <%= f.submit t("login"), class: "btn primary-button users-login-primary-button" %>
             <div class="users-text-container">
               <span class="users-text"><%= t("users.ask_new_user") %></span>
-              <%= link_to t("sign_up"), new_registration_path(resource_name) ,class:"anchor-text" %>
+              <%= link_to t("sign_up"), new_registration_path(resource_name), class: "anchor-text" %>
             </div>
           </div>
         </div>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 14dab3fa54..87941d9052 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -4,11 +4,11 @@
       <h6 class="users-shared-row"><%= t("users.shared.login_with") %></h6>
     </div>
     <div class="row center-row">
-      <%= link_to image_tag("SVGs/google-plus.svg", :alt=>"Google Icon", :class=>"users-social-links"), user_google_oauth2_omniauth_authorize_path, method: :post %>
-      <%= link_to image_tag("SVGs/facebook.svg", :alt=>"Facebook Icon", :class=>"users-social-links"), user_facebook_omniauth_authorize_path, method: :post %>
-      <%= link_to image_tag("SVGs/github.svg", :alt=>"Github Icon", :class=>"users-social-links"), user_github_omniauth_authorize_path, method: :post %>
+      <%= link_to image_tag("SVGs/google-plus.svg", alt: "Google Icon", class: "users-social-links"), user_google_oauth2_omniauth_authorize_path, method: :post %>
+      <%= link_to image_tag("SVGs/facebook.svg", alt: "Facebook Icon", class: "users-social-links"), user_facebook_omniauth_authorize_path, method: :post %>
+      <%= link_to image_tag("SVGs/github.svg", alt: "Github Icon", class: "users-social-links"), user_github_omniauth_authorize_path, method: :post %>
       <% if Flipper.enabled?(:gitlab_integration) %>
-        <%= link_to image_tag("SVGs/gitlab.svg", :alt=>"Gitlab Icon", :class=>"users-social-links"), user_gitlab_omniauth_authorize_path, method: :post %>
+        <%= link_to image_tag("SVGs/gitlab.svg", alt: "Gitlab Icon", class: "users-social-links"), user_gitlab_omniauth_authorize_path, method: :post %>
       <% end %>
     </div>
     <% if Flipper.enabled?(:sso_integration) %>
diff --git a/app/views/users/unlocks/new.html.erb b/app/views/users/unlocks/new.html.erb
index a7904d10c9..c41228c4e1 100644
--- a/app/views/users/unlocks/new.html.erb
+++ b/app/views/users/unlocks/new.html.erb
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 center-image">
-      <%= image_tag "SVGs/login.svg", alt: "Login Sketch", :class => "users-image" %>
+      <%= image_tag "SVGs/login.svg", alt: "Login Sketch", class: "users-image" %>
       <h5 class="users-image-text"><%= t("welcome_back_text") %></h5>
     </div>
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
@@ -20,12 +20,12 @@
           <div class="field form-group">
             <h6><%= f.label :email %></h6>
             <div class="input-group">
-              <%= f.email_field :email, autofocus: true, class:"form-control form-input" %>
+              <%= f.email_field :email, autofocus: true, class: "form-control form-input" %>
             </div>
           </div>
           <div class="field form-group">
             <div class="input-group">
-              <%= f.submit t("users.unlock.resend_unlock_instructions") ,class:"btn primary-button users-primary-button" %>
+              <%= f.submit t("users.unlock.resend_unlock_instructions"), class: "btn primary-button users-primary-button" %>
             </div>
           </div>
           <%= render "users/shared/links" %>
diff --git a/config/application.rb b/config/application.rb
index ab1dcf4743..da8d1df16c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,7 +18,7 @@ class Application < Rails::Application
     # configuring mailer previews directory
     config.action_mailer.preview_path = "#{Rails.root}/lib/mailer_previews"
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
-    config.i18n.available_locales = [:en, :hi, :bn]
+    config.i18n.available_locales = [:en, :hi, :bn, :mr]
     config.i18n.default_locale = :en
     config.i18n.fallbacks = true
 
diff --git a/config/locales/forms/announcements/mr.yml b/config/locales/forms/announcements/mr.yml
new file mode 100644
index 0000000000..02cef9c38c
--- /dev/null
+++ b/config/locales/forms/announcements/mr.yml
@@ -0,0 +1,12 @@
+mr:
+  helpers:
+    label:
+      announcement:
+        body: "घोषणा संस्था"
+        link: "अधिक जाणून घ्या"
+        start_date: "प्रारंभ दिवस"
+        end_date: "कालबाह्यता दिवस"
+    submit:
+      announcement:
+        create: "नवीन घोषणा तयार करा"
+        update: "अद्यतन घोषणा"
diff --git a/config/locales/forms/assignments/mr.yml b/config/locales/forms/assignments/mr.yml
new file mode 100644
index 0000000000..26692c74fa
--- /dev/null
+++ b/config/locales/forms/assignments/mr.yml
@@ -0,0 +1,11 @@
+mr:
+  helpers:
+    label:
+      assignment:
+        name: "नाव"
+        description: "वर्णन"
+        grading_scale: "ग्रेडिंग स्केल"
+    submit:
+      assignment:
+        create: "असाइनमेंट तयार करा"
+        update: "असाइनमेंट अद्यतनित करा"
diff --git a/config/locales/forms/groups/mr.yml b/config/locales/forms/groups/mr.yml
new file mode 100644
index 0000000000..b82ccab189
--- /dev/null
+++ b/config/locales/forms/groups/mr.yml
@@ -0,0 +1,13 @@
+mr:
+  helpers:
+    label:
+      group_member:
+        emails: "ई-मेल आयडी:"
+      group:
+        name: "गटाचे नाव:"
+    submit:
+      group_member:
+        create: "सदस्य जोडा"
+      group:
+        create: "ते जतन करा"
+        update: "सेव करा"
diff --git a/config/locales/forms/projects/mr.yml b/config/locales/forms/projects/mr.yml
new file mode 100644
index 0000000000..974ea5e484
--- /dev/null
+++ b/config/locales/forms/projects/mr.yml
@@ -0,0 +1,16 @@
+mr:
+  helpers:
+    label:
+      collaboration:
+        emails: "ई-मेल आईडी:"
+      project:
+        name: "नाव"
+        tag_list: "टॅग यादी"
+        project_access_type: "प्रकल्प प्रवेश प्रकार"
+        description: "वर्णन"
+    submit:
+      collaboration:
+        create: "सहयोगी जोडा"
+      project:
+        create: "प्रकल्प तयार करा"
+        update: "प्रकल्प अद्यतनित करा"
diff --git a/config/locales/forms/users/mr.yml b/config/locales/forms/users/mr.yml
new file mode 100644
index 0000000000..b37aafeef9
--- /dev/null
+++ b/config/locales/forms/users/mr.yml
@@ -0,0 +1,11 @@
+mr:
+  helpers:
+    label:
+      user:
+        email: "ई-मेल"
+        name: "नाव"
+        country: "देश"
+        educational_institute: "शैक्षणिक संस्था"
+        locale: "भाषा"
+        password: "पासवर्ड"
+        password_confirmation: "पासवर्ड पुष्टी करा"
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
new file mode 100644
index 0000000000..96eb3a2c94
--- /dev/null
+++ b/config/locales/mr.yml
@@ -0,0 +1,65 @@
+mr:
+  edit: "एडिट करा"
+  show: "दाखवा"
+  delete: "ते हटवा"
+  view: "येथे पहा"
+  launch_simulator: "सिम्युलेटर लाँच करा"
+  email_us_heading: "आम्हाला ईमेल करा"
+  join_at_slack_heading: "आमच्याशी कनेक्ट व्हा आणि गप्पा मारा"
+  join_at_slack_description: "सुस्त चॅनेल"
+  welcome_back_text: "डिजिटल सर्किट्स युनिव्हर्समध्ये आपले स्वागत आहे!"
+  save: "सेव करा"
+  back: "परत जा"
+  login: "लॉग इन करा"
+  sign_up: "साइन अप करा"
+  sign_out: "साइन आउट करा"
+  assignment: "असाइनमेंट"
+  launch: "लाँच करा"
+  fork: "फ़ोर्क करा"
+  more: "अधिक जाणून घ्या"
+  submit: "प्रस्तुत करणे"
+  features_heading: "गुणधर्म"
+  features_description: "ड्रॅग-अँड-ड्रॉप, कॉपी/पेस्ट, झूम आणि अधिक वैशिष्ट्ये वापरून आधुनिक आणि अंतर्ज्ञानी वापरकर्ता इंटरफेससह द्रुत आणि सहज डिजिटल सर्किट तयार करा."
+  add_members: "सदस्य जोडा"
+  add_mentors: "एक मार्गदर्शक जोडा"
+  remove: "काढा"
+  reopen: "पुन्हा उघडा"
+  close: "बंद करा"
+  not_available: "उपलब्ध नाही"
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "अर्धा मिनिट"
+      less_than_x_seconds:
+        one:   "1 सेकंद" # default was: "less than 1 second"
+        other: "%{count} सेकंद" # default was: "less than %{count} seconds"
+      x_seconds:
+        one:   "1 सेकंद"
+        other: "%{count} सेकंद"
+      less_than_x_minutes:
+        one:   "एक मिनिट" # default was: "less than a minute"
+        other: "%{count} मिनिट" # default was: "less than %{count} minutes"
+      x_minutes:
+        one:   "एक मिनिट"
+        other: "%{count} मिनिट"
+      about_x_hours:
+        one:   "1 तास" # default was: "about 1 hour"
+        other: "%{count} तास" # default was: "about %{count} hours"
+      x_days:
+        one:   "1 दिवस"
+        other: "%{count} दिवस"
+      about_x_months:
+        one:   "1 महिना" # default was: "about 1 month"
+        other: "%{count} महिना" # default was: "about %{count} months"
+      x_months:
+        one:   "1 महिना"
+        other: "%{count} महीने"
+      about_x_years:
+        one:   "1 वर्ष" # default was: "about 1 year"
+        other: "%{count} वर्ष" # default was: "about %{count} years"
+      over_x_years:
+        one:   "1 वर्ष" # default was: "over 1 year"
+        other: "%{count} वर्ष" # default was: "over %{count} years"
+      almost_x_years:
+        one:   "1 वर्ष" # default was: "almost 1 year"
+        other: "%{count} वर्ष" # default was: "almost %{count} years"
diff --git a/config/locales/views/about/mr.yml b/config/locales/views/about/mr.yml
new file mode 100644
index 0000000000..aa8fb80d94
--- /dev/null
+++ b/config/locales/views/about/mr.yml
@@ -0,0 +1,20 @@
+mr:
+  about:
+    title: "सर्किटवर्स - आमच्याबद्दल"
+    main_heading: "सर्किटवर्स बद्दल जाणून घ्या"
+    main_description: "सर्किटवर्स च्या मागे योगदानकर्त्यांबद्दल जाणून घ्या"
+    product_details: "सर्किटवर्स हे आयआयआयटी-बंगलोरच्या विद्यार्थ्यांनी विकसित केलेले उत्पादन आहे.
+          ग्राफिकल यूजर इंटरफेस वापरून सर्किट डिझाइन आणि सिम्युलेशन करता येईल असे व्यासपीठ प्रदान करणे हे त्याचे उद्दिष्ट आहे.
+          वापरकर्ते सिम्युलेटरद्वारे संपूर्ण सीपीयू अंमलबजावणी तयार करू शकतात, परंतु सॉफ्टवेअर प्रामुख्याने शैक्षणिक वापरासाठी डिझाइन केलेले आहे.
+          सर्किटवर्स हा सक्रिय समुदायासह मुक्त-स्रोत प्रकल्प आहे. अधिक माहितीसाठी योगदान पृष्ठ पहा."
+    terms_of_service: "सेवा अटी"
+    privacy_policy: "गोपनीयता धोरण"
+    core_team_heading: "सर्किटवर कोर टीम"
+    core_team_description: "सर्किटवर्स चे नेतृत्व नवोन्मेष आणि उत्कृष्टतेसाठी समर्पित अनुभवी टीम करत आहे."
+    mentors_team_heading: "सर्किटवरचे सदस्य"
+    mentors_team_description: "आमचे फेलो नवीन योगदानकर्त्यांच्या व्यावसायिक विकासास समर्थन देतात आणि त्यांना मदत करण्यासाठी सक्रिय मार्गदर्शन देखील देतात."
+    alumni_team_heading: "सर्किटवर्स चे माजी सदस्य"
+    alumni_team_description: "आम्ही सर्किटवर्स च्या सर्व माजी सदस्यांचे त्यांच्या अमूल्य योगदानाबद्दल आभार मानू इच्छितो."
+    contributors_heading: "योगदानकर्त्यांसाठी"
+    contributors_description: "सर्किटवर्स समुदायातील योगदानकर्त्यांना भेटा जे हे व्यासपीठ अधिक चांगले बनवतात."
+    become_contributor: "योगदानकर्ता व्हा"
diff --git a/config/locales/views/announcements/mr.yml b/config/locales/views/announcements/mr.yml
new file mode 100644
index 0000000000..670c19ea89
--- /dev/null
+++ b/config/locales/views/announcements/mr.yml
@@ -0,0 +1,7 @@
+mr:
+  announcements:
+    learn_more: "अधिक जाणून घ्या"
+    edit_announcement_heading: "घोषणा संपादित करा"
+    recent_announcement_heading: "अलीकडील घोषणा"
+    new_announcement: "नवीन घोषणा"
+    no_announcement_heading: "अद्याप कोणतीही घोषणा नाही."
diff --git a/config/locales/views/assignments/mr.yml b/config/locales/views/assignments/mr.yml
new file mode 100644
index 0000000000..07d1549203
--- /dev/null
+++ b/config/locales/views/assignments/mr.yml
@@ -0,0 +1,40 @@
+mr:
+  assignments:
+    group_name: "गट: %{name}"
+    deadline: "वेळेची मर्यादा:"
+    remaining_time_error: "(स्क्रिप्ट लोड करताना एक त्रुटी आली)"
+    form:
+      grade_scale_cant_change: "(एकदा सेट बदलता येत नाही)"
+      cannot_be_edited: "%{graded} - संपादित करू शकत नाही"
+      enable_element_restriction: "संपादित करू शकत नाही"
+      enable_feature_restriction: "वैशिष्ट्य निर्बंध सक्षम करा:"
+      time_remaining: "बाकी वेळ: %{time}"
+      no_grade: "ग्रेड नाही"
+      letter: "लेटर(A-F)"
+      percent: "टक्के(1-100)"
+      custom: "कस्टम"
+    edit:
+      edit_assignment: "असाइनमेंट संपादित करा"
+    new:
+      title: "%{name} - नवीन असाइनमेंट"
+      new_assignment_heading: "नवीन असाइनमेंट"
+    show:
+      title: "%{name} - असाइनमेंट वर्णन"
+      assignment_details_heading: "असाइनमेंट वर्णन"
+    assignment_data:
+      name_html: "<strong>नाव:</strong> %{name}"
+      group_html: "<strong>गट:</strong> %{group_name}"
+      time_remaining_html: "<strong>बाकी वेळ:</strong> %{time_remaining}"
+      graded_html: "<strong>श्रेणीबद्ध:</strong> %{graded}"
+      description: "वर्णन:"
+      restricted_elements_html: "<strong>प्रतिबंधित सर्किट घटक</strong> %{restricted_circuit_elements}"
+      export_grades: "निर्यात ग्रेड"
+      submissions: "सबमिशन:"
+      restricted_features_html: "<strong>प्रतिबंधित फीचर:<strong> %{restricted_features}"
+      no_submissions: "अद्याप कोणतेही सबमिशन नाहीत!"
+      grades_and_remarks: "ग्रेड और रिमार्क्स"
+      grade: "ग्रेड"
+      remarks: "रिमार्क्स"
+      grading_scale_percent: "असाइनमेंटची टक्केवारी (1-100) मध्ये श्रेणीबद्ध केली जाऊ शकते"
+      grading_scale_letter: "असाइनमेंट कोणत्याही अक्षराने A/B/C/D/E/F चिन्हांकित करू द्या. श्रेणीबद्ध केली जाऊ शकते"
+      remove: "काढा"
diff --git a/config/locales/views/circuitverse/mr.yml b/config/locales/views/circuitverse/mr.yml
new file mode 100644
index 0000000000..b6bd054f06
--- /dev/null
+++ b/config/locales/views/circuitverse/mr.yml
@@ -0,0 +1,151 @@
+mr:
+  circuitverse:
+    contribute:
+      title: "सर्किटवर्स - योगदान द्या"
+      main_heading: "योगदान द्या"
+      main_description: "सर्किटवर्स च्या एलिट सदस्यांबद्दल अधिक जाणून घ्या"
+      submain_description: "सर्किटवर कायमस्वरूपी विनामूल्य राहण्याचे उद्दिष्ट आहे आणि आम्ही वचन देतो की आम्ही जाहिराती चालवणार नाही!
+             हा प्रकल्प ओपन सोर्स आहे आणि त्याचा सतत विकास आणि देखभाल सुनिश्चित करण्यासाठी आम्हाला तुमच्या पाठिंब्याची गरज आहे."
+      contribute_at_github_heading: "ओपन सोर्स मध्ये योगदान द्या"
+      contribute_at_github_description: "गिटहब"
+      how_to_support_heading: "समर्थन कसे करायचे?"
+      student_card:
+        main_heading: "मी विद्यार्थी आहे"
+        item1_text: "अप्रतिम सर्किट तयार करा आणि फोरमवर शेअर करा"
+        item2_text_html: "आमच्या <a class='anchor-text' href='https://learn.circuitverse.org' target='_blank'>परस्परसंवादी पुस्तक</a> सह लॉजिक डिझाइनच्या जगात जा"
+        item3_text: "तुमच्या मित्रांना प्लॅटफॉर्मची ओळख करून द्या, सर्किट तयार करा आणि सर्किट्स वैशिष्ट्यीकृत करा!"
+      teacher_card:
+        main_heading: "मी शिक्षक आहे"
+        item1_text: "तुमच्या विद्यार्थ्यांना व्यासपीठाची ओळख करून द्या"
+        item2_text: "तुमच्या मंडळांमध्ये प्लॅटफॉर्मचा प्रचार करा"
+        item3_text: "सर्किटवर्स वापरून रोमांचक शैक्षणिक सामग्री तयार करा"
+      developer_card:
+        main_heading: "मी एक डेवलपर आहे"
+        item1_text: "ओपन सोर्स प्रकल्पांमध्ये योगदान द्या"
+        item2_text: "सर्किटवर प्रोजेक्टमध्ये नवीन वैशिष्ट्ये जोडा"
+        item3_text: "सर्किटवर्स प्रकल्पातील बग शोधा आणि त्याचे निराकरण करा"
+      become_patreon: "पैट्रियन व्हा"
+      donate_via_paypal: "पेपल द्वारे देणगी द्या"
+    examples:
+      title: "सर्किटवर्स - सर्किटची उदाहरणे"
+      main_heading: "सर्किट्सची उदाहरणे"
+      main_description: "जाणून घ्या आणि सर्वोत्तम उदाहरणे आणि वापरकर्त्यांद्वारे प्रेरित व्हा"
+    index:
+      title: "सर्किटवर्स - ऑनलाइन डिजिटल लॉजिक सर्किट सिम्युलेटर"
+      main_heading: "लॉजिक सर्किट्सच्या जगात विनामूल्य जा!"
+      main_description: "मानक आईसी बद्दल अधिक जाणून घ्या, साध्या गेट्सपासून जटिल अनुक्रमिक सर्किट्स, प्लॉट टायमिंग डायग्राम, स्वयंचलित सर्किट जनरेशन आणि बरेच काही"
+      learn_logic_design: "लॉजिक डिझाइन शिका"
+      for_teachers: "शिक्षकांसाठी"
+      for_contributors: "योगदानकर्त्यांसाठी"
+      explore_more: "ते अधिक एक्सप्लोर करा"
+      features:
+        main_heading: "गुणधर्म"
+        main_description: "ड्रॅग-अँड-ड्रॉप, कॉपी/पेस्ट, झूम आणि अधिक वैशिष्ट्ये वापरून आधुनिक आणि अंतर्ज्ञानी वापरकर्ता इंटरफेससह द्रुत आणि सहज डिजिटल सर्किट तयार करा."
+        item1_heading: "उच्च-रिझोल्यूशन प्रतिमा निर्यात करा"
+        item1_text: "सर्किटवर्स एसवीजी सह अनेक फॉरमॅटमध्ये उच्च-रिझोल्यूशन प्रतिमा निर्यात करू शकते."
+        item2_heading: "संयोजन विश्लेषण"
+        item2_text: "सत्य सारणी डेटावर आधारित सर्किट्स स्वयंचलितपणे व्युत्पन्न करा. कॉम्प्लेक्स लॉजिक सर्किट्स तयार करण्यासाठी हे उत्तम आहे आणि एका सबसर्किटमध्ये सहजपणे तयार केले जाऊ शकते."
+        item3_heading: "ब्लॉगमध्ये एम्बेड करा"
+        item3_text: "सर्किटवर्स हे HTML5 मध्ये बनवलेले असल्याने, प्रत्येक प्रोजेक्टसाठी एक iframe व्युत्पन्न केले जाऊ शकते जे वापरकर्त्याला जवळजवळ कुठेही एम्बेड करू देते."
+        item4_heading: "सबसर्किट वापरा"
+        item4_text: "एकदा सबसर्किट तयार करा आणि ते पुन्हा पुन्हा वापरा. हे सोपे आणि अधिक संरचित डिझाइनला अनुमती देते."
+        item5_heading: "मल्टी बिट बसेस आणि घटक"
+        item5_text: "सर्किटवर्स मल्टी-बिट-वायरला सपोर्ट करते, याचा अर्थ सर्किट बनवणे सोपे, जलद आणि व्यवस्थित आहे."
+      featured_examples:
+        main_heading: "वैशिष्ट्यीकृत उदाहरण"
+        main_description: "जाणून घ्या आणि सर्वोत्तम उदाहरणांद्वारे प्रेरित व्हा"
+        circuit1_text: "16-बिट रिपल कैरी एडर"
+        circuit2_text: "सैप-1"
+        circuit3_text: "2 हाफ ऍडर ते पूर्ण ऍडर"
+      editor_picks:
+        main_heading: "संपादकाची निवड"
+        main_description: "हे सर्किट आमच्या लेखकांनी त्यांच्या उत्कृष्टतेसाठी निवडले आहेत"
+      recent_circuits:
+        main_heading: "हे सर्किट आमच्या लेखकांनी त्यांच्या उत्कृष्टतेसाठी निवडले आहेत"
+        main_description: "आमच्या शीर्ष वापरकर्त्यांकडून नवीनतम सर्किट्सबद्दल अधिक जाणून घ्या"
+    teachers:
+      title: "सर्किटवर्सचे शिक्षक"
+      main_heading: "शिक्षकांसाठी"
+      main_description: "सर्किटवर्स हे वर्गात वापरण्यास अतिशय सोपे असावे म्हणून डिझाइन केले आहे. प्लॅटफॉर्ममध्ये शिक्षकांना वर्ग आणि असाइनमेंटमध्ये मदत करण्यासाठी वैशिष्ट्ये आहेत."
+      benefits: "शिक्षकांसाठी फायदे"
+      create_group_heading: "गट तयार करा आणि तुमचे विद्यार्थी जोडा"
+      post_assignment_heading: "असाइनमेंट तयार करा"
+      grade_assignment_heading: "ग्रेडिंगचे कार्य"
+      use_interactive_circuit_heading: "तुमच्या ब्लॉग, अभ्यास साहित्य किंवा पावर प्वाइंट सादरीकरणांमध्ये परस्परसंवादी सर्किट वापरा"
+      create_group_description: "तुम्ही गट तयार करू शकता आणि त्यात तुमचे विद्यार्थी जोडू शकता! जर विद्यार्थी आधीच सर्किटविव्हर्ससह जोडले गेले असतील तर ते आपोआप जोडले जातील. जर ते अद्याप सर्किटवर सामील झाले नाहीत, तर सामील होण्याचे आमंत्रण पाठवले जाईल. एकदा त्यांनी नोंदणी केली की ते आपोआप जोडले जातील."
+      post_assignment_description: "असाइनमेंट तयार करण्यासाठी, फक्त नवीन असाइनमेंट बटणावर क्लिक करा. असाइनमेंट आणि अंतिम मुदत तपशीलवार. असाइनमेंट अंतिम मुदतीवर आपोआप बंद होईल. शिक्षक असाइनमेंट पुन्हा उघडेपर्यंत विद्यार्थी त्यांच्या असाइनमेंट चालू ठेवू शकत नाहीत."
+      grade_assignment_description: "बिल्ड प्रिव्ह्यूसह अतिशय सहजपणे असाइनमेंट ग्रेड करा. फक्त, विद्यार्थ्याला त्याच्या असाइनमेंटसाठी निवडा."
+      use_interactive_circuit_description: "प्रकल्प सार्वजनिक असल्याची खात्री करा. एम्बेड HTML5 कोड मिळविण्यासाठी एम्बेड क्लिक करा, त्यानंतर फक्त सर्किट एम्बेड करा. लाइव्ह सर्किट एम्बेड करण्यासाठी तुम्हाला लाइव्ह स्लाइड्स सारखे पॉवरपॉईंट प्लगइन वापरावे लागेल."
+    tos:
+      title: "सर्किटवर्स - सेवा अटी"
+      main_heading: "सेवा अटी"
+      user_agreement:
+        main_heading: "1. वापरकर्ता करार"
+        description1_html: "1.1 या वापराच्या अटी तुम्ही आणि तुमच्यावर नियंत्रण ठेवणार्‍या सर्किटव्हर्स टीम यांच्यात एक करार तयार करतात <a href='https://CircuitVerse.org/'>CircuitVerse.org</a> के उपयोग को नियंत्रित करती है। सर्किटवर्स टीम में इंटरनेशनल इंस्टिट्यूट ऑफ़ इनफार्मेशन टेक्नोलॉजी, बैंगलोर (&quot;आईआईआईटी-बैंगलोर&quot;) च्या प्राध्यापक आणि विद्यार्थी कृपया वापराच्या अटी काळजीपूर्वक वाचा. Circuitverse वापरून तुम्ही पुष्टी करता की तुम्ही वापराच्या अटींमधील अटी व शर्ती वाचल्या, समजल्या आणि स्वीकारल्या आहेत. तुम्ही यापैकी कोणत्याही अटींशी सहमत नसल्यास, कृपया सर्किटव्हर्स वापरू नका."
+        description2_html: "1.2 तुमची गोपनीयता आमच्यासाठी अत्यंत महत्त्वाची आहे. कृपया आमचे <a href='https://CircuitVerse.org/privacy'>गोपनीयता धोरण</a> वाचा, जे सर्व्हिसेसद्वारे गोळा केलेली माहिती Circuitverse टीम कशी वापरते आणि संग्रहित करते हे ओळखते. Circuitverse चा वापर करून, तुम्ही देखील सहमत आहात की तुम्ही Circuitverse च्या गोपनीयता धोरणास अनुकूल आहात."
+        description3: "1.3 सर्किटवर्स हे सर्व वयोगटातील मुलांसाठी आणि प्रौढांसाठी खुले आहे आणि सर्किटवर्स सेवा वापरताना तुम्ही हे लक्षात ठेवावे असे आम्ही सांगतो."
+      description4_html: "1.4 सर्किटवर्स टीम वेळोवेळी वापराच्या अटी बदलू शकते. तुम्ही नेहमी <a href='https://CircuitVerse.org/tos'>https://CircuitVerse.org/tos</a> येथे वापर अटींची नवीनतम आवृत्ती शोधू शकता. तुमचा सेवांचा सतत वापर या वापराच्या अटींमधील कोणतेही बदल किंवा बदल तुमची स्वीकृती आहे."
+      account_creation:
+        main_heading: "2. खाते तयार करणे आणि देखभाल करणे"
+        description1_html: "2.1 सेवांची काही वैशिष्ट्ये वापरण्यासाठी, तुम्ही सर्किटवर्स शी कनेक्ट करून खाते तयार केले पाहिजे. खाते तयार करणे ऐच्छिक आहे, परंतु खात्याशिवाय, तुम्ही सर्किटवर प्रकल्प किंवा टिप्पण्या जतन किंवा प्रकाशित करू शकणार नाही. वैयक्तिक खात्यासाठी नोंदणी करताना, तुम्हाला तुमचा ईमेल पत्ता, लिंग, महिना आणि वर्ष आणि जन्माचा देश यासारखी काही वैयक्तिक माहिती प्रदान करण्यास सांगितले जाईल. कृपया सर्किटवर्स च्या डेटा धारण आणि वापर धोरणांसाठी CircuitVerse चे <a href='https://CircuitVerse.org/privacy'>गोपनीयता धोरण</a> पहा."
+        description2: "2.2 तुमचा पासवर्ड गुप्त ठेवण्यासाठी आणि तुमचे खाते सुरक्षित ठेवण्यासाठी तुम्ही जबाबदार आहात. तुमच्या खात्याच्या कोणत्याही वापरासाठी तुम्ही पूर्णपणे जबाबदार असाल, जरी तुमचे खाते दुसर्‍या व्यक्तीने वापरले असले तरीही. तुमच्या खात्याचा कोणताही वापर या सेवा अटींचे उल्लंघन करत असल्यास, तुमचे खाते निलंबित किंवा हटवले जाऊ शकते."
+        description3: "2.3 तुम्ही परवानगीशिवाय दुसऱ्या व्यक्तीचे सर्किटवर खाते वापरू शकत नाही."
+        description4_html: "2.4 यदि आपके पास यह मानने का कारण है कि आपका खाता अब सुरक्षित नहीं है (उदाहरण के लिए, आपके पासवर्ड के खोने, चोरी होने या अनधिकृत प्रकटीकरण की स्थिति में), तो तुरंत अपना पासवर्ड बदलें। यदि आप अपना पासवर्ड बदलने के लिए अपने खाते तक नहीं पहुंच सकते हैं, तो हमें यहां <a href='mailto:support@CircuitVerse.org'>support@CircuitVerse.org</a> सूचित करें|"
+      usage_rule:
+        main_heading: "3. वापरण्याच्या अटी"
+        description1: "3.1 सर्किटवर्स टीम अभिव्यक्ती स्वातंत्र्याचे समर्थन करते. तथापि, सर्किटवर्स हे विस्तृत प्रेक्षकांसाठी आहे आणि काही सामग्री सर्किटवर्स समुदायासाठी अनुचित असू शकते. तुम्ही कोणत्याही प्रकारे सर्किटवर सेवा वापरू शकत नाही, जर:"
+        list1_item1: "कोणत्याही व्यक्ती किंवा समूहाविरुद्ध धर्मांधता, भेदभाव, द्वेष किंवा हिंसेला प्रोत्साहन देते;"
+        list1_item2: "इतर कोणत्याही व्यक्तीला धमकावणे, त्रास देणे किंवा धमकावणे, मग ती व्यक्ती सर्किटवर वापरकर्ता असो किंवा नसो;"
+        list1_item3: "द्वेषयुक्त भाषण किंवा वैयक्तिक हल्ले समाविष्ट आहेत;"
+        list1_item4: "लैंगिकदृष्ट्या सुस्पष्ट किंवा ग्राफिकली हिंसक सामग्री आहे;"
+        list1_item5: "सर्किटवर्स च्या कार्यक्रमांच्या संदर्भात, दुसर्या वापरकर्त्यास वैयक्तिकरित्या ओळखणारी माहिती, संपर्क माहिती किंवा संकेतशब्द विचारतो; किंवा"
+        list1_item6: "सर्किटवर्स इव्हेंटच्या आचरणाच्या संबंधात, दुसर्या वापरकर्त्यास वैयक्तिकरित्या ओळखणारी माहिती, संपर्क माहिती किंवा संकेतशब्द विचारतो; किंवा"
+        list1_item7: "त्या व्यक्तीच्या परवानगीशिवाय इतर कोणत्याही व्यक्तीची वैयक्तिकरित्या ओळखणारी माहिती, संपर्क माहिती किंवा पासवर्ड उघड करते."
+        description2: "3.2 तुम्ही सर्किटवर्स वापरता तेव्हा तुम्ही सर्व लागू कायदे आणि नियमांचे पालन करण्यास सहमती देता. तुम्ही Circuitverse चा वापर कोणत्याही बेकायदेशीर रीतीने करू शकत नाही, ज्यामध्ये दुसर्‍या व्यक्तीचा छळ करणे, दांडी मारणे किंवा बदनामी करणे समाविष्ट आहे."
+        description3: "3.3 सेवा वापरताना तुम्ही तोतयागिरी, तोतयागिरी किंवा तोतयागिरी करू शकत नाही."
+        description4: "3.4 सेवेमध्ये व्यत्यय आणण्यासाठी, सेवेमध्ये अनधिकृत प्रवेश मिळवण्यासाठी किंवा सेवा वापरण्याच्या इतर कोणत्याही वापरकर्त्याच्या क्षमतेमध्ये हस्तक्षेप करण्यासाठी कोणत्याही प्रकारे सर्किटवॉर्सचा वापर न करण्याबद्दल तुम्ही सहमत आहात. जर ग्राहक निषिद्ध क्रियाकलापांमध्ये गुंतले तर यासह, परंतु इतकेच मर्यादित नाही:"
+        list2_item1: "सर्किटवर्स वेबसाइट किंवा संपादक क्रॅश करण्यासाठी हेतुपुरस्सर डिझाइन केलेली सामग्री पोस्ट करणे;"
+        list2_item2: "व्हायरस किंवा मालवेअर असलेल्या पृष्ठांशी लिंक करणे;"
+        list2_item3: "प्रशासक पासवर्ड वापरणे किंवा प्रशासकाची तोतयागिरी करणे;"
+        list2_item4: "समान सामग्री वारंवार पोस्ट करणे किंवा \"स्पॅमिंग\""
+        list2_item5: "पर्यायी खाती वापरणे किंवा साइट आकडेवारी हाताळण्यासाठी मतदान गट आयोजित करणे, जसे की हेतुपुरस्सर \"समुदाय काय आवडते/रिमिक्स करत आहे\" पहिल्या पानाच्या ओळी."
+      user_content_licensing:
+        main_heading: "4. वापरकर्ता-व्युत्पन्न सामग्री आणि परवाना"
+        description1: "4.1 वापराच्या अटींच्या उद्देशांसाठी, \"वापरकर्ता व्युत्पन्न सामग्री\" मध्ये कोणतेही प्रकल्प, टिप्पण्या, फोरम पोस्ट्स किंवा तृतीय पक्षाच्या वेबसाइट्सच्या लिंक्सचा समावेश आहे जे वापरकर्ते Circuitverse ला सबमिट करतात."
+        description2: "4.2 सर्किटवर्स टीम प्रत्येकाला कोणत्याही स्वरूपात ज्ञान मुक्तपणे सामायिक करून सर्जनशीलतेला चालना देण्यासाठी प्रोत्साहित करते. तथापि, आम्ही व्यक्ती आणि कंपन्यांना त्यांच्या बौद्धिक संपदा अधिकारांचे संरक्षण करण्याची आवश्यकता देखील समजतो. तुम्ही Circuitverse ला सबमिट केलेल्या कोणत्याही वापरकर्ता-व्युत्पन्न सामग्रीसाठी तुमच्याकडे आवश्यक अधिकार, परवाने किंवा परवानग्या आहेत याची खात्री करण्यासाठी तुम्ही जबाबदार आहात."
+        description3_html: "4.3 तुम्ही सर्किटवर्स ला सबमिट केलेली सर्व वापरकर्ता-व्युत्पन्न सामग्री <a href='https://creativecommons.org/licenses/by-sa/2.0/'>Creative Commons Attribution-ShareAlike 2.0 लायसन्स</a> अंतर्गत परवानाकृत आहे आणि आहे सर्किटवर्स द्वारे परवानाकृत. हे इतरांना तुमची सामग्री पाहण्याची आणि फोर्क करण्यास अनुमती देते. हा परवाना सर्किटवर्स टीमला तुमची सामग्री सर्किटवर्स वेबसाइटवर, सोशल मीडिया चॅनेलवर आणि इतरत्र प्रदर्शित, वितरण आणि पुनरुत्पादित करण्याची परवानगी देतो. जर तुम्हाला या परवान्याअंतर्गत तुमच्या साहित्याचा परवाना द्यायचा नसेल, तर तो सर्किटवर्स वर शेअर करू नका."
+        description4: "4.4 अहवाल दिलेल्या वापरकर्त्याने व्युत्पन्न केलेल्या सामग्रीचे पुनरावलोकन करण्याव्यतिरिक्त, सर्किटवर्स टीमने सर्किटवर्स सेवांच्या सर्व वापरावर लक्ष ठेवण्याचा अधिकार राखून ठेवला आहे, परंतु कोणतेही बंधन नाही. सर्किटवर्स टीम या वापर अटी किंवा समुदाय मार्गदर्शक तत्त्वांचे उल्लंघन करणारी कोणतीही सामग्री सूचना न देता संपादित करू शकते, हलवू शकते किंवा काढून टाकू शकते."
+        description5: "4.6 सर्व वापरकर्ता-व्युत्पन्न सामग्री आहे तशी प्रदान केली आहे. सर्किटवर्स टीम सर्किटवर्स द्वारे उपलब्ध असलेल्या कोणत्याही वापरकर्ता-व्युत्पन्न सामग्रीच्या अचूकतेबद्दल किंवा विश्वासार्हतेबद्दल कोणतीही हमी देत ​​नाही आणि सर्किटवर्स डे इव्हेंटला मान्यता देत नाही किंवा सांगितलेल्या इव्हेंटच्या संदर्भात पोस्ट केलेल्या माहितीची पडताळणी किंवा पडताळणी करत नाही. सर्किटवर्स टीम वापरकर्त्याने व्युत्पन्न केलेल्या सामग्रीमध्ये व्यक्त केलेल्या कोणत्याही दृश्ये, मते किंवा सल्ल्याचे समर्थन करत नाही. तुम्ही तुमच्या वापरकर्त्याने व्युत्पन्न केलेल्या कंटेंटमधून आणि तुम्ही आयोजित किंवा होस्ट करू शकता अशा सर्किटव्हर्स डे इव्हेंटमधून उद्भवणाऱ्या कोणत्याही आणि सर्व दायित्वांपासून सर्किटव्हर्स टीमला मुक्त करण्यास सहमत आहात."
+      site_content_licensing:
+        main_heading: "5. सर्किटवर्स सामग्री आणि परवाना"
+        description1: "5.1 कोणत्याही वापरकर्त्याने व्युत्पन्न केलेली सामग्री, सर्किटव्हर्स टीम, सर्किटव्हर्स कोड, सर्किटव्हर्सची रचना, कार्यक्षमता आणि आर्किटेक्चर आणि सर्किटव्हर्स (एकत्रितपणे \"सर्किटव्हर्स IP\") वगळता. जर तुम्ही या वापर अटींद्वारे परवानगी नसलेल्या मार्गाने सर्किटवर्स चा वापर करू इच्छित असाल, तर तुम्ही प्रथम सर्किटवर्स टीमशी संपर्क साधला पाहिजे. या वापराच्या अटींनुसार स्पष्टपणे मंजूर केलेले कोणतेही अधिकार वगळता, तुम्हाला कोणत्याही सर्किटवर आयपीमध्ये आणि कोणतेही अधिकार दिले जात नाहीत."
+      dmca:
+        main_heading: "6. डिजिटल मिलेनियम कॉपीराइट कायदा (डीएमसीए)"
+        description1_html: "6.1 तुम्ही कॉपीराइट धारक असल्यास आणि सर्किटव्हर्स वरील सामग्री तुमच्या अधिकारांचे उल्लंघन करत असल्याचा विश्वास असल्यास, तुम्ही <a href='mailto:support@CircuitVerse.org'>support@CircuitVerse.org</a> शी संपर्क साधू शकता.&nbsp; वर मेल पाठवू शकता"
+        description2_html: "6.2 जर तुम्ही सर्किटव्हर्स वापरकर्ता असाल आणि तुमचा विश्वास आहे की तुमची सामग्री कॉपीराइट उल्लंघन करत नाही आणि ती चुकून काढली गेली आहे, तर तुम्ही <a href='mailto:support@CircuitVerse.org'>support@CircuitVerse.org </a> शी संपर्क साधू शकता. वर सूचना पाठवू शकतात. कृपया समाविष्ट करा:"
+        list_item1: "तुमचे सर्किटवर वापरकर्तानाव आणि ईमेल पत्ता;"
+        list_item2: "तुमचा विश्वास आहे की विशिष्ट सामग्री चुकून काढली गेली आहे; आणि"
+        list_item3: "तुम्हाला असे वाटते की कोणतेही कॉपीराइट उल्लंघन का झाले नाही याचे थोडक्यात वर्णन (उदाहरणार्थ, सामग्री कॉपीराइट केलेली नव्हती, तुम्हाला सामग्री वापरण्याची परवानगी होती, किंवा सामग्रीचा तुमचा वापर हा \"वाजवी वापर\" होता)."
+      account_related:
+        main_heading: "7. खाते निलंबन आणि समाप्ती"
+        description1: "7.1 वापर अटी किंवा समुदाय मार्गदर्शक तत्त्वांचे उल्लंघन केल्याबद्दल तुमचे खाते निलंबित करण्याचा अधिकार सर्किटवर्स राखून ठेवते. वारंवार उल्लंघन करणाऱ्यांची खाती हटवली जाऊ शकतात. वापराच्या अटी किंवा समुदाय मार्गदर्शक तत्त्वांचे उल्लंघन काय आहे हे निर्धारित करण्याचा एकमेव अधिकार सर्किटवर्स संघ राखून ठेवतो. सर्किटवर्स कार्यसंघ वापराच्या अटींची पूर्वीची अंमलबजावणी टाळण्यासाठी वापरलेले कोणतेही खाते समाप्त करण्याचा अधिकार राखून ठेवतो."
+        description2_html: "7.2 तुम्ही तुमचे खाते हटवू किंवा तात्पुरते अक्षम करू इच्छित असल्यास, कृपया <a href='mailto:support@CircuitVerse.org'>support@CircuitVerse.org</a> वर ईमेल करा."
+      third_party_website:
+        main_heading: "8. तृतीय पक्ष वेबसाइट्स"
+        description1: "8.1 सर्किटवर्स वरील सामग्री, वापरकर्त्याने व्युत्पन्न केलेल्या सामग्रीसह, तृतीय पक्षाच्या वेबसाइट्सच्या लिंक्सचा समावेश असू शकतो. Circuitverse टीम तृतीय पक्षाच्या वेबसाइटचे पुनरावलोकन किंवा व्यवस्थापित करण्यास सक्षम नाही आणि तृतीय पक्ष वेबसाइट्सच्या गोपनीयता पद्धती, सामग्री किंवा कार्यक्षमतेसाठी कोणतीही जबाबदारी घेत नाही. तुम्ही सर्कीटव्हर्स टीमला तृतीय-पक्षाच्या वेबसाइट्सवरून उद्भवणाऱ्या कोणत्याही आणि सर्व दायित्वांपासून मुक्त करण्यास सहमत आहात."
+      indemnification:
+        main_heading: "9. प्रीमियम"
+        description1: "तुम्ही आयआयआयटी-बंगलोर, सर्किटव्हर्स टीम, सर्किटवर्स फाउंडेशन आणि त्यांचे सर्व सहयोगी, कर्मचारी, प्राध्यापक सदस्य, सहयोगी, विद्यार्थी, एजंट, प्रतिनिधी, तृतीय पक्ष सेवा प्रदाते आणि त्यांच्या गव्हर्निंग बोर्डचे सदस्य (या सर्वांची) नुकसानभरपाई देण्यास सहमत आहात ) सहमत आहे. \"Circuitverse Entities\"), आणि त्यांच्यापैकी प्रत्येकाला तुमच्या सेवेच्या अटींमधून किंवा सर्किटवर्स च्या वापरातून किंवा अंतर्गत उद्भवलेल्या कोणत्याही आणि सर्व दावे आणि दायित्वे (वकीलांच्या शुल्कासह) नुकसानभरपाई केली जाईल."
+        description2: "फेडरल सरकारी संस्थांसाठी, फेडरल कायद्याद्वारे स्पष्टपणे अधिकृत केलेल्या मर्यादेशिवाय, नुकसानभरपाईशी संबंधित वापराच्या अटींच्या तरतुदी तुमच्या अधिकृत वापरावर लागू होणार नाहीत. युनायटेड स्टेट्समधील राज्य आणि स्थानिक सरकारी संस्थांसाठी, नुकसानभरपाईशी संबंधित वापराच्या अटी तुमच्या अधिकारक्षेत्रातील कायद्यांद्वारे अधिकृत केलेल्या मर्यादेपर्यंतच तुमच्या अधिकृत वापरासाठी लागू होतील."
+      warranty_related:
+        main_heading: "10. वॉरंटीचा अस्वीकरण"
+        description1: "तुम्ही कबूल करता की तुम्ही तुमच्या स्वत:च्या जोखमीवर सर्किटवर वापरत आहात. CircuitVerse \"जसे आहे तसे\" आहे आणि CircuitVerse संस्था याद्वारे अचूकता, विश्वासार्हता, शीर्षक, व्यापारक्षमता, गैर-उल्लंघन, विशिष्ट हेतूसाठी फिटनेस यासह कोणत्याही आणि सर्व वॉरंटी स्पष्टपणे अस्वीकृत करतात, स्पष्ट आणि निहित. इतर हमी, स्थिती, हमी किंवा कोणत्याही प्रकारची हमी. प्रस्तुतीकरण, तोंडी असो, लिखित स्वरूपात असो किंवा इलेक्ट्रॉनिक स्वरूपात, येथे समाविष्ट असलेल्या किंवा सर्किटव्हर्सद्वारे प्रदान केलेल्या कोणत्याही माहितीची अचूकता किंवा पूर्णता यासह परंतु मर्यादित नाही. अगोदर निर्देश केलेल्या बाबीसंबंधी बोलताना Circuitverse Entities वापरकर्त्याने व्युत्पन्न केलेली सामग्री आणि सर्किटवर डे इव्हेंट्सच्या संदर्भात व्यक्त आणि निहित कोणत्याही आणि सर्व वॉरंटी नाकारतात. Circuitverse Entities आणि त्यांचे तृतीय पक्ष सेवा प्रदाते Circuitverse मधील प्रवेश अखंडित असेल किंवा प्रसारित केलेल्या माहितीचे कोणतेही अपयश, त्रुटी किंवा चुक किंवा नुकसान होणार नाही किंवा Circuitverse सेवांद्वारे कोणतेही व्हायरस प्रसारित केले जाणार नाहीत असे प्रतिनिधित्व किंवा हमी देत ​​नाहीत. जा"
+      liability_related:
+        main_heading: "11. दायित्वाची मर्यादा"
+        description1: "अशा कोणत्याही दाव्याचे स्वरूप किंवा कारवाईचे कारण विचारात न घेता, कोणत्याही प्रत्यक्ष, अप्रत्यक्ष, विशेष, परिणामी किंवा दंडात्मक नुकसानीसाठी सर्किटव्हर्स एंटिटीज तुम्हाला किंवा कोणत्याही तृतीय पक्षास जबाबदार राहणार नाहीत, तरीही सर्किटवर टीमला नुकसान होण्याची शक्यता आहे. सल्ला दिला आहे. अगोदर निर्देश केलेल्या बाबीसंबंधी बोलताना, Circuitverse संस्थांना वापरकर्त्याने व्युत्पन्न केलेल्या सामग्री किंवा सर्किटवर दिवसाच्या इव्हेंट्समुळे होणार्‍या कोणत्याही हानी किंवा नुकसानासाठी तुमचे किंवा कोणत्याही तृतीय पक्षाचे कोणतेही उत्तरदायित्व असणार नाही."
+      choice_of_language:
+        main_heading: "14. भाषा का चुनाव"
+        description1: "जर Circuitverse टीम तुम्हाला या वापर अटी, गोपनीयता धोरण किंवा इतर कोणत्याही धोरणाच्या इंग्रजी भाषेतील आवृत्तीचे भाषांतर प्रदान करत असेल, तर तुम्ही सहमत आहात की भाषांतर केवळ माहितीच्या उद्देशाने प्रदान केले आहे आणि इंग्रजी भाषेच्या आवृत्तीत बदल करत नाही. भाषांतर आणि इंग्रजी आवृत्ती यांच्यात संघर्ष झाल्यास, इंग्रजी आवृत्ती नियंत्रित करेल."
+      no_waiver:
+        main_heading: "15. माफी नाही"
+        description1: "या वापराच्या अटींच्या कोणत्याही अटींची कोणतीही माफी ही अशा मुदतीची किंवा इतर कोणत्याही मुदतीची पुढील किंवा चालू असलेली माफी मानली जाणार नाही आणि या वापर अटींखालील कोणताही अधिकार किंवा तरतुदी सांगण्यात सर्किटव्हर्स टीमचे अयशस्वी हे अशा अधिकाराची माफी मानणार नाही. किंवा तरतूद."
diff --git a/config/locales/views/featured_circuits/mr.yml b/config/locales/views/featured_circuits/mr.yml
new file mode 100644
index 0000000000..5d0d10eafd
--- /dev/null
+++ b/config/locales/views/featured_circuits/mr.yml
@@ -0,0 +1,5 @@
+mr:
+  featured_circuits:
+    title: "सर्किटवर्स - संपादकाची निवड"
+    main_heading: "संपादकाची निवड"
+    main_description: "हे सर्किट आमच्या लेखकांनी त्यांच्या उत्कृष्टतेसाठी निवडले आहेत"
diff --git a/config/locales/views/groups/mr.yml b/config/locales/views/groups/mr.yml
new file mode 100644
index 0000000000..6dee4d2e98
--- /dev/null
+++ b/config/locales/views/groups/mr.yml
@@ -0,0 +1,44 @@
+mr:
+  groups:
+    add_member_description: "स्वल्पविराम/स्पेसेस किंवा वेगळ्या ओळींनी विभक्त केलेले ईमेल आयडी प्रविष्ट करा. जर वापरकर्त्याने प्रवेश केला नसेल, तर त्यांना एक ईमेल आयडी पाठवला जाईल आणि त्यांना साइन अप करण्याची विनंती केली जाईल."
+    add_mentor_description_html: "<p>मार्गदर्शक हे करू शकतात:</p><ul><li>असाइनमेंट तयार आणि हटवू शकतात</li><li>ग्रेड असाइनमेंट</li><li>बंद असाइनमेंट पुन्हा उघडू शकतात</li></ul>"
+    promote_member_confirmation: "तुम्‍हाला खात्री आहे की तुम्‍ही या सदस्‍याला मेंटॉर म्‍हणून प्रमोट करू इच्छिता?"
+    demote_mentor_confirmation: "तुमची खात्री आहे की तुम्ही या मार्गदर्शकाची सदस्य म्हणून अवनत करू इच्छिता?"
+    use_alternative: "किंवा वापरा"
+    invite_link_btn: "दुव्याद्वारे आमंत्रित करा"
+    remove_assignment_message: "तुमची खात्री आहे की तुम्ही ही असाइनमेंट हटवू इच्छिता?"
+    remove_member_message: "तुमची खात्री आहे की तुम्ही हा सदस्य काढू इच्छिता?"
+    make_member: "सदस्य तयार करा"
+    make_mentor: "एक मार्गदर्शक तयार करा"
+    edit:
+      title: "%{name} - गटाचे नाव संपादित करा"
+      main_heading: "गटाचे नाव संपादित करा"
+    new:
+      title: "सर्किटवर्स - नवीन गट"
+      main_heading: "नवीन गट"
+      main_description_html: "विद्यार्थ्‍यांसाठी प्रोजेक्‍ट सेट करण्‍यासाठी आणि ग्रेड देण्‍यासाठी मार्गदर्शकांद्वारे गटांचा वापर केला जाऊ शकतो.
+          तुम्ही <a class='anchor-text' href='https://docs.circuitverse.org/#/chapter2/2cvforeducators' target='_blank'>येथे</a> दस्तऐवज वाचू शकता."
+    show:
+      edit_name_btn: "नाव संपादित करा"
+      primary_mentor_heading: "प्राथमिक मार्गदर्शक:"
+      mentor_name_heading: "मार्गदर्शक:"
+      group_members_heading: "सदस्य"
+      add_members_btn: "+ सदस्य जोडा"
+      add_mentors_btn: "+ मेंटमार्गदर्शक जोडा"
+      no_mentors_html: "या गटामध्ये कोणतेही संरक्षक नाहीत, सदस्य जोडण्यासाठी <strong>+ सदस्य जोडा</strong> बटणावर क्लिक करा."
+      no_members_html: "गटात एकही सदस्य नाही, सदस्य जोडण्यासाठी <strong>+ Mentor जोडा</strong> बटणावर क्लिक करा."
+      no_assignments_html: "गटामध्ये कोणतेही असाइनमेंट नाही, असाइनमेंट सुरू करण्यासाठी <strong>+ असाइनमेंट जोडा</strong> बटणावर क्लिक करा."
+      assignment:
+        heading: "असाइनमेंट"
+        add_assignment_btn: "+ असाइनमेंट जोडा"
+        assignment_table_head:
+          name: "नाव"
+          deadline: "वेळेची मर्यादा"
+          grading: "प्रतवारी"
+          actions: "क्रिया"
+          grade: "ग्रेड"
+        time_remaining_html: "<strong>उर्वरित वेळ:</strong> %{time_remaining}"
+        start_working_btn: "काम चालू करा"
+        see_work_done: "तुमचे काम पहा"
+        not_submitted: "सादर केले नाही"
+        show_submission: "सबमिशन पहा"
diff --git a/config/locales/views/layouts/mr.yml b/config/locales/views/layouts/mr.yml
new file mode 100644
index 0000000000..956bd3ce11
--- /dev/null
+++ b/config/locales/views/layouts/mr.yml
@@ -0,0 +1,33 @@
+mr:
+  layout:
+    link_to_simulator: "सिम्युलेटर"
+    getting_started_dropdown: "सुरुवात कशी करावी"
+    link_to_learn_more: "येथे शिका"
+    link_to_docs: "डॉक्यूमेंटेशन"
+    link_to_features: "गुणधर्म"
+    link_to_teachers: "शिक्षकांसाठी"
+    link_to_blog: "ब्लॉग"
+    link_to_about: "सर्किटवर्स बद्दल"
+    footer:
+      social_icon_text: "आम्हाला येथे अनुसरण फॉलो करा"
+      link_to_examples: "उदाहरण"
+      my_circuits: "माझे सर्किट"
+      link_to_contribute: "योगदान"
+      link_to_forum: "फोरम"
+      sponsor_logo_text:
+        brought_by: "द्वारे तुमच्यासाठी आणले:"
+        hosting_sponsor: "प्रायोजक:"
+        marketed_by: "द्वारे विपणन:"
+        developed_by: "द्वारे विकसित:"
+      copyright_text: "कॉपीराइट © %{time_current_year} Circuitverse, सर्व हक्क राखीव."
+    header:
+      dashboard: "डैशबोर्ड"
+      my_groups: "माझा गट"
+      notifications: "अधिसूचना"
+      language: "भाषा निवडा"
+    mailer:
+      join_us: "आमच्यात सामील व्हा"
+      copyright_text: "कॉपीराइट © %{time_current_year} सर्किटवर. सर्व हक्क राखीव. कोणत्याही समस्यांसाठी, support@circuitverse.org वर आमच्याशी संपर्क साधा"
+      unsubscribe_email_notifications: "ईमेल सूचनांमधून सदस्यत्व रद्द करा"
+    simulator:
+      title: "सर्किटवर्स - डिजिटल सर्किट सिम्युलेटर ऑनलाइन"
diff --git a/config/locales/views/lti/mr.yml b/config/locales/views/lti/mr.yml
new file mode 100644
index 0000000000..086c940e18
--- /dev/null
+++ b/config/locales/views/lti/mr.yml
@@ -0,0 +1,9 @@
+mr:
+  launch_error:
+    title: "सर्किटवर्स - एलटीआई त्रुटि"
+    main-heading: "सामग्री उपलब्ध नाही"
+    main-description: "तुम्ही विनंती करत असलेली सामग्री यावेळी उपलब्ध नाही किंवा तुम्ही सामग्रीमध्ये प्रवेश करण्यासाठी अधिकृत नाही."
+  open_incv:
+    notice_wait_in_open_incv: "कृपया आम्ही ही असाइनमेंट Circuitverse मध्ये उघडेपर्यंत प्रतीक्षा करा..."
+    notice_redirection_error: "हे काम करत नसल्यास, कृपया खालील बटणावर क्लिक करा."
+    open_assignment: "असाइनमेंट उघडा"
diff --git a/config/locales/views/paginator/mr.yml b/config/locales/views/paginator/mr.yml
new file mode 100644
index 0000000000..91cef14228
--- /dev/null
+++ b/config/locales/views/paginator/mr.yml
@@ -0,0 +1,4 @@
+mr:
+  will_paginate:
+    previous_label: "&#8592; मागील"
+    next_label: "पुढील &#8594;"
diff --git a/config/locales/views/projects/mr.yml b/config/locales/views/projects/mr.yml
new file mode 100644
index 0000000000..3bb0c51cfa
--- /dev/null
+++ b/config/locales/views/projects/mr.yml
@@ -0,0 +1,51 @@
+mr:
+  projects:
+    add_collaborator_description: "स्वल्पविराम, स्पेस किंवा एंटरने विभक्त केलेला ईमेल आयडी प्रविष्ट करा. वापरकर्त्यांनी प्लॅटफॉर्मवर आधीपासूनच नोंदणी करणे आवश्यक आहे.
+              लक्षात घ्या की सहयोग अद्याप वास्तविक वेळ नाही. प्रत्येक बचत मागील डेटा अधिलिखित करते."
+    remove_collaborator_message: "तुमची खात्री आहे की तुम्ही हा सहयोगकर्ता काढू इच्छिता?"
+    delete_project_message: "तुम्हाला नक्की हा प्रकल्प हटवायचा आहे का?"
+    form:
+      feature_circuit_checkpoint: "प्रदर्शित वैशिष्ट्यीकृत (केवळ प्रशासक)"
+      tag_list_description: "(तुमचे प्रोजेक्ट टॅग स्वल्पविरामाने वेगळे करा [,])"
+      project_is_featured_message: "(हा प्रकल्प वैशिष्ट्यीकृत आहे. सार्वजनिक प्रवेश काढून टाकल्यास ते वैशिष्ट्यीकृत केले जाणार नाही.)"
+      public: "पब्लिक"
+      private: "प्राइवेट"
+      limited_access: "लिमिटेड एक्सेस"
+    edit:
+      title: "%{name} - प्रकल्प संपादित करा"
+      main_heading: "प्रकल्प एडिट करा"
+    get_projects:
+      searched_projects_heading: "प्रकल्प शोधला"
+      searched_tags_heading: "टैग:"
+    stars_count: "स्टार"
+    views_count: "व्यूज"
+    project_user: "वापरकर्ता:"
+    show:
+      project_author: "लेखक"
+      project_forked_from: "येथून फोर्क केले"
+      project_access_type: "प्रकल्प प्रवेश प्रकार"
+      project_description: "वर्णन:"
+      project_created_at: "तयार केल्यावर:"
+      project_updated_at: "अद्यतनित केल्यावर"
+      project_embed: "एम्बेड"
+      project_copy: "कॉपी प्रकल्प"
+      project_collaborator_add: "+ एक सहकारी जोडा"
+      copied_to_clipboard: "क्लिपबोर्डवर कॉपी केले!"
+      collaborators: "सहयोगी"
+    search:
+      no_result_found: "कोणताही परिणाम आढळला नाही"
+    modal:
+      embed_circuit_heading: "आपले सर्किट एम्बेड करा"
+      height: "उंची"
+      width: "रुंदी"
+      url: "यूआरएल"
+      border: "मर्यादा"
+      border_style: "सीमा शैली"
+      publish_button: "प्रकाशित करा"
+      advance:
+        advance_option: "प्रगत पर्याय"
+        clock_time: "घड्याळ/वेळ"
+        display_title: "शीर्षक प्रदर्शन"
+        fullscreen: "पूर्ण स्क्रीन"
+        zoom_in_out: "झूम इन/आउट करा"
+        theme: "थीम"
diff --git a/config/locales/views/simulator/navigation/mr.yml b/config/locales/views/simulator/navigation/mr.yml
new file mode 100644
index 0000000000..075c8e6da5
--- /dev/null
+++ b/config/locales/views/simulator/navigation/mr.yml
@@ -0,0 +1,8 @@
+mr:
+  simulator:
+    nav_item:
+      project: "प्रकल्प"
+      circuit: "सर्किट"
+      tools: "डिव्हाइस"
+      help: "मदत"
+    insert_Subcircuitcontent: "अवलंबित्व म्हणून हे सर्किट नसलेले दुसरे कोणतेही सर्किट दिसत नाही. एक नवीन तयार करा!"
diff --git a/config/locales/views/users/mr.yml b/config/locales/views/users/mr.yml
new file mode 100644
index 0000000000..265125e783
--- /dev/null
+++ b/config/locales/views/users/mr.yml
@@ -0,0 +1,96 @@
+mr:
+  users:
+    minimum_password_length: "(किमान %{minimum_password_length} वर्ण)"
+    ask_new_user: "तुम्ही नवीन वापरकर्ता आहात का?"
+    confirmations:
+      resend_confirmation_instructions: "पुष्टीकरण सूचना पुन्हा पाठवा"
+    circuitverse:
+      delete_group_confirmation: "तुमची खात्री आहे की तुम्ही हा गट हटवू इच्छिता?"
+      delete_user_confirmation: ""
+      preview_project: "प्रकल्प पूर्वावलोकन"
+      member_since_html: "<strong>पासून सदस्य:</strong> %{member_since} दिवस"
+      educational_institutes_html: "<strong>शैक्षणिक संस्था:</strong> %{educational_institute}"
+      country_html: "<strong>देश:</strong> %{country_name}"
+      total_circuits_made_html: "<strong>एकूण सर्किट बांधले: </strong> %{total_circuits}"
+      edit_profile:
+        title: "%{name} - प्रोफाइल संपादित करा"
+        heading: "प्रोफाईल संपादित करा"
+        description_html: "<sup><i class=\"fa fa-asterisk user-edit-asterisk\"></i></sup> सह चिन्हांकित फील्ड अनिवार्य आहेत"
+        profile_picture: "परिचय चित्र"
+        choose_file: "फाईल निवडा"
+        remove_picture: "फोटो हटवा"
+        country_select_placeholder: "प्रवेश न करणे पसंत करा"
+        select_locale_prompt: "लोकॅल निवडा"
+        subscribe_mail_checkpoint: "तुम्ही ईमेलची सदस्यता घेतली आहे का?"
+        delete_account_heading: "तुमचे खाते हटवा"
+        delete_account_notice: "सावधानपूर्वक पुढे जा! ही क्रिया पूर्ववत केली जाऊ शकत नाही."
+        delete_account: "खाते काढा"
+      groups:
+        title: "%{name} - तुमचा गट"
+        alt_title: "शून्य - तुमचा गट"
+        main_heading: "तुमचा गट"
+        make_new_group: "+ नवीन गट तयार करा"
+        groups_user_mentor_to: "तुम्ही निर्देशित केलेले गट:"
+        total_members: "एकूण सदस्य: %{group_member_count}"
+        groups_user_belong_to: "तुम्ही ज्या गटांमध्ये आहात:"
+        groups_user_owns: "तुमचे स्वतःचे गट:"
+      index:
+        title: "%{name} - तुमचे सर्किट"
+        alt_title: "शून्य - आपले सर्किट"
+        edit_details: "प्रोफाईल संपादित करा"
+        my_circuits: "मी बनवलेले सर्किट"
+        favourite_circuits: "पसंतीचे सर्किट"
+        collaborated_circuits: "सहाय्यक सर्किट्स"
+        search_circuits: "सर्किट शोधा..."
+        no_projects_heading_html: "तुम्ही कोणतेही प्रकल्प तयार केलेले नाहीत. %{simulator_new_url} प्रकल्प तयार करा"
+        create_here: "येथे"
+        no_user_projects: "%{name} ने तयार केलेला कोणताही प्रकल्प नाही."
+        no_favourites_heading_html: "तुम्हाला आवडणारे कोणतेही प्रकल्प नाहीत. %{simulator_new_url} प्रकल्प तयार करा"
+        no_user_favourites: "%{name} ला आवडलेले कोणतेही प्रकल्प नाहीत."
+        not_a_collaborator: "तुम्ही प्रकल्प सहयोगी नाही."
+        user_not_a_collaborator: "%{name} कोणत्याही प्रकल्पासाठी योगदानकर्ता नाही."
+      search:
+        no_results: "कोणताही परिणाम आढळला नाही"
+    mailer:
+      user_welcome_msg: "%{email} मध्ये आपले स्वागत आहे!"
+      confirm_account_description: "तुम्ही खालील लिंकद्वारे तुमचे खाते ईमेल सत्यापित करू शकता:"
+      link_to_confirm_account: "माझे खाते सत्यापित करा"
+      email_changed_msg: "तुमचा ईमेल %{email} मध्ये बदलला जात असल्याची माहिती देण्यासाठी आम्ही तुमच्याशी संपर्क साधत आहोत."
+      password_changed_msg: "तुमचा पासवर्ड बदलला गेला आहे हे कळवण्यासाठी आम्ही तुमच्याशी संपर्क साधत आहोत."
+      reset_password_request_msg: "कोणीतरी तुमचा पासवर्ड बदलण्यासाठी लिंकची विनंती केली आहे. तुम्ही खालील लिंकद्वारे पासवर्ड बदलू शकता."
+      link_to_reset_password: "माझा पासवर्ड बदला"
+      reset_password_description1: "तुम्ही पासवर्ड बदलण्याची विनंती केली नसल्यास, कृपया या ईमेलकडे दुर्लक्ष करा."
+      reset_password_description2: "जोपर्यंत तुम्ही वरील लिंकवर प्रवेश करत नाही आणि नवीन पासवर्ड तयार करत नाही तोपर्यंत तुमचा पासवर्ड बदलणार नाही."
+      unlock_account_description1: "अनेक अयशस्वी साइन-इन प्रयत्नांमुळे तुमचे खाते लॉक केले गेले आहे."
+      unlock_account_description2: "तुमचे खाते अनलॉक करण्यासाठी खालील लिंकवर क्लिक करा:"
+      link_to_unlock_account: "माझे खाते अनलॉक करा"
+    passwords:
+      change_password_heading: "आपला पासवर्ड बदला"
+      change_password: "माझा पासवर्ड बदला"
+      link_to_login_page: "लॉगिन पृष्ठावर जा"
+      forgot_password_heading: "तुमचा पासवर्ड विसरलात?"
+      send_reset_link: "पासवर्ड रीसेट लिंक पाठवा"
+    registrations:
+      get_started: "सर्किट जतन करणे, गट तयार करणे आणि बरेच काही सुरू करण्यासाठी येथे नोंदणी करा!"
+      ask_already_registered: "आधीच नोंदणी झाली आहे?"
+    sessions:
+      forgot_password: "तुमचा पासवर्ड विसरलात?"
+      remember_me: "माझे लॉगिन लक्षात ठेवा"
+    shared:
+      login_with: "वापरून लॉग इन करा"
+      login_with_sso: "एकल चिन्ह चालू"
+    unlocks:
+      resend_unlock_instructions: "अनलॉक सूचना पुन्हा पाठवा"
+    notifications:
+      heading: "नोटिफिकेशन्स"
+      all: "सर्व"
+      unread: "न वाचलेले"
+      mark_as_read_button: "सर्व वाचलेले म्हणून चिन्हांकित करा"
+      no_notifications: "तुमच्याकडे कोणत्याही सूचना नाहीत!"
+      no_unread_notifications: "तुमच्याकडे कोणत्याही न वाचलेल्या सूचना नाहीत!"
+      see_all : "सभी देखें"
+      fork_notification: "%{user} ने तुमचा प्रकल्प  फोर्क केला %{project}"
+      star_notification: "%{user} ने तुमच्या प्रकल्पाला तारांकित केले %{project}"
+      new_assignment_notification: "तुम्हाला एक नवीन कार्य नियुक्त केले गेले आहे! - '%{assignment_name}'"
+      forum_thread_notification: "%{user} ने नवीन धागा '%{thread}' पोस्ट केला"
+      comment_notif: "%{user} ने '%{thread}' वर ​​टिप्पणी केली"
\ No newline at end of file
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index de66d0f083..803224f5dd 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.1)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -16,7 +16,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     contracts (0.13.0)
     dotenv (2.8.1)
     erubis (2.7.0)
@@ -81,7 +81,7 @@ GEM
       middleman-core (>= 3.2)
       rouge (~> 2.0)
     mini_portile2 (2.8.0)
-    minitest (5.17.0)
+    minitest (5.18.0)
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
@@ -117,12 +117,12 @@ GEM
     tilt (2.0.11)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     webrick (1.7.0)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
diff --git a/package.json b/package.json
index efa6489d3e..4859ea47e8 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.18.2",
-    "@commitlint/cli": "^17.0.2",
+    "@commitlint/cli": "^17.5.0",
     "@commitlint/config-conventional": "^17.4.4",
     "canvas": "^2.9.1",
     "chokidar": "^3.5.3",
diff --git a/simulator/src/css/main.stylesheet.css b/simulator/src/css/main.stylesheet.css
index 57197c631f..5510818cee 100644
--- a/simulator/src/css/main.stylesheet.css
+++ b/simulator/src/css/main.stylesheet.css
@@ -169,14 +169,14 @@ input[type="text"]:focus {
 }
 
 .projectName {
-    position: relative;
-    left: 0.5rem;
     font-size: 1em;
     text-align: center;
     display: inline-block;
     width: 35vw;
+    height: 1.2rem;
     overflow: hidden;
     text-overflow: ellipsis;
+    margin-right: 22rem;
 }
 
 @media (max-width: 991px) {
@@ -186,8 +186,6 @@ input[type="text"]:focus {
 }
 
 .account-btn {
-    position: absolute;
-    right: 13px;
     padding: 4px 10px;
     border: 1px solid transparent;
     border-radius: 1px;
@@ -201,6 +199,7 @@ input[type="text"]:focus {
 .user-field {
     display: inline-block;
     max-width: 11rem;
+    height: 1.2rem;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/simulator/src/data/backupCircuit.js b/simulator/src/data/backupCircuit.js
index 66adf80aaf..1e029c2bb7 100755
--- a/simulator/src/data/backupCircuit.js
+++ b/simulator/src/data/backupCircuit.js
@@ -1,4 +1,5 @@
 import { projectSavedSet } from './project';
+import { autosave } from './save';
 /* eslint-disable no-param-reassign */
 function extract(obj) {
     return obj.saveObject();
@@ -63,6 +64,11 @@ export function scheduleBackup(scope = globalScope) {
         scope.backups.push(backup);
         scope.history = [];
         scope.timeStamp = new Date().getTime();
+
+        //Calling the autosave() function after a delay of 0.1 second, to allow scheduleBackup() function to complete its execution first
+        setTimeout(() => {
+            autosave();
+        }, 100);      
         projectSavedSet(false);
     }
 
diff --git a/simulator/src/data/project.js b/simulator/src/data/project.js
index 56331b0eb1..eacfef1435 100755
--- a/simulator/src/data/project.js
+++ b/simulator/src/data/project.js
@@ -20,6 +20,12 @@ export function recoverProject() {
             load(data);
         }
         localStorage.removeItem('recover');
+    } else if (localStorage.getItem('autosave')) {
+        var data = JSON.parse(localStorage.getItem('autosave'));
+        if (confirm(`Would you like to recover: ${data.name}`)) {
+            load(data);
+        }
+        localStorage.removeItem('autosave');    
     } else {
         showError('No recover project found');
     }
@@ -100,17 +106,18 @@ function checkToSave() {
  * Prompt user to save data if unsaved
  * @category data
  */
-window.onbeforeunload = function () {
+window.addEventListener('beforeunload', function (event) {
     if (projectSaved || embed) return;
 
     if (!checkToSave()) return;
 
-    alert('You have unsaved changes on this page. Do you want to leave this page and discard your changes or stay on this page?');
+    event.preventDefault();
+    event.returnValue = '';
     const data = generateSaveData('Untitled');
     localStorage.setItem('recover', data);
-    // eslint-disable-next-line consistent-return
-    return 'Are u sure u want to leave? Any unsaved changes may not be recoverable';
-};
+    const confirmationMessage = 'You have unsaved changes on this page. Do you want to leave this page and discard your changes or stay on this page?';
+    return confirmationMessage;
+  });
 
 /**
  * Function to clear project
diff --git a/simulator/src/data/save.js b/simulator/src/data/save.js
index ea7fe50855..e08a2d5c64 100755
--- a/simulator/src/data/save.js
+++ b/simulator/src/data/save.js
@@ -14,6 +14,7 @@ import domtoimage from 'dom-to-image';
 import C2S from '../../vendor/canvas2svg';
 
 var projectName = undefined;
+var autosave_array = [];
 
 /**
  * Function to set the name of project.
@@ -407,3 +408,17 @@ export default async function save() {
     // Restore everything
     resetup();
 }
+
+/**
+ * Function to autosave the data of circuit
+ * @category data
+ * @exports save
+ */
+export function autosave() {
+    var data = generateSaveData('Untitled');
+    autosave_array.push(data);
+    if (autosave_array.length > 2) {
+        autosave_array.shift();
+    }
+    localStorage.setItem('autosave',  autosave_array[0]);
+}
diff --git a/simulator/src/setup.js b/simulator/src/setup.js
index 6bee1834a3..32209d3334 100755
--- a/simulator/src/setup.js
+++ b/simulator/src/setup.js
@@ -184,6 +184,9 @@ export function setup() {
         } else if (localStorage.getItem('recover')) {
             // Restore unsaved data which didn't get saved due to error
             showMessage("We have detected that you did not save your last work. Don't worry we have recovered them. Access them using Project->Recover");
+        } else if (localStorage.getItem('autosave')) {
+            // Restore unsaved data which didn't get saved due to simulator crash.
+            showMessage("We have detected an unexpected simulator crash. Don't worry we have recovered your project. Access them using Project->Recover");
         }
     }, 1000);
 
diff --git a/spec/controllers/featured_circuit_controller_spec.rb b/spec/controllers/featured_circuit_controller_spec.rb
index 7953f855c6..d2ed0261f7 100644
--- a/spec/controllers/featured_circuit_controller_spec.rb
+++ b/spec/controllers/featured_circuit_controller_spec.rb
@@ -4,7 +4,7 @@
 
 describe FeaturedCircuitsController, type: :request do
   before do
-    @project = FactoryBot.create(:project, author: FactoryBot.create(:user), \
+    @project = FactoryBot.create(:project, author: FactoryBot.create(:user),
                                            project_access_type: "Public")
   end
 
@@ -35,7 +35,7 @@
 
     it "creates featured_circuit" do
       expect do
-        post featured_circuits_path, params: { featured_circuit: \
+        post featured_circuits_path, params: { featured_circuit:
           { featured: "1", project_id: @project.id } }
       end.to change(FeaturedCircuit, :count).by(1)
     end
@@ -44,7 +44,7 @@
       FactoryBot.create(:featured_circuit, project: @project)
 
       expect do
-        delete featured_circuits_path, params: { featured_circuit: \
+        delete featured_circuits_path, params: { featured_circuit:
           { featured: "0", project_id: @project.id } }
       end.to change(FeaturedCircuit, :count).by(-1)
     end
diff --git a/spec/requests/api/v1/grades_controller/create_spec.rb b/spec/requests/api/v1/grades_controller/create_spec.rb
index 4ae36176a3..4945505935 100644
--- a/spec/requests/api/v1/grades_controller/create_spec.rb
+++ b/spec/requests/api/v1/grades_controller/create_spec.rb
@@ -51,7 +51,7 @@
     context "when authorized but tries to create duplicate grade" do
       before do
         FactoryBot.create(
-          :grade, project: project, assignment: assignment, \
+          :grade, project: project, assignment: assignment,
                   user_id: primary_mentor.id, grade: "A", remarks: "Good"
         )
         token = get_auth_token(primary_mentor)
diff --git a/spec/requests/api/v1/grades_controller/destroy_spec.rb b/spec/requests/api/v1/grades_controller/destroy_spec.rb
index 70e5ab2d53..9af923a402 100644
--- a/spec/requests/api/v1/grades_controller/destroy_spec.rb
+++ b/spec/requests/api/v1/grades_controller/destroy_spec.rb
@@ -10,7 +10,7 @@
     let!(:project) { FactoryBot.create(:project, assignment: assignment) }
     let!(:grade) do
       FactoryBot.create(
-        :grade, project: project, assignment: assignment, \
+        :grade, project: project, assignment: assignment,
                 user_id: primary_mentor.id, grade: "A", remarks: "Good"
       )
     end
diff --git a/spec/requests/api/v1/grades_controller/update_spec.rb b/spec/requests/api/v1/grades_controller/update_spec.rb
index 47e8ef2fa5..6fa7ebd778 100644
--- a/spec/requests/api/v1/grades_controller/update_spec.rb
+++ b/spec/requests/api/v1/grades_controller/update_spec.rb
@@ -10,7 +10,7 @@
     let!(:project) { FactoryBot.create(:project, assignment: assignment) }
     let!(:grade) do
       FactoryBot.create(
-        :grade, project: project, assignment: assignment, \
+        :grade, project: project, assignment: assignment,
                 user_id: primary_mentor.id, grade: "A", remarks: "Good"
       )
     end
diff --git a/yarn.lock b/yarn.lock
index 9fb1442ba6..3874bfa173 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1204,18 +1204,18 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@commitlint/cli@^17.0.2":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.0.2.tgz#57c925fb5f09b8e4a83448d94db291ddf7aa58ee"
-  integrity sha512-Axe89Js0YzGGd4gxo3JLlF7yIdjOVpG1LbOorGc6PfYF+drBh14PvarSDLzyd2TNqdylUCq9wb9/A88ZjIdyhA==
-  dependencies:
-    "@commitlint/format" "^17.0.0"
-    "@commitlint/lint" "^17.0.0"
-    "@commitlint/load" "^17.0.0"
-    "@commitlint/read" "^17.0.0"
-    "@commitlint/types" "^17.0.0"
+"@commitlint/cli@^17.5.0":
+  version "17.5.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.5.0.tgz#045bf46fc38bb4246da30b462d8db66f48c28f9a"
+  integrity sha512-yNW3+M7UM1ioK28LKTrryIVB5qGpXlEv8+rJQiWPMZNayy9/1XR5+lL8qBTNlgopYtZWWnIm5RETcAN29ZTL/A==
+  dependencies:
+    "@commitlint/format" "^17.4.4"
+    "@commitlint/lint" "^17.4.4"
+    "@commitlint/load" "^17.5.0"
+    "@commitlint/read" "^17.4.4"
+    "@commitlint/types" "^17.4.4"
     execa "^5.0.0"
-    lodash "^4.17.19"
+    lodash.isfunction "^3.0.9"
     resolve-from "5.0.0"
     resolve-global "1.0.0"
     yargs "^17.0.0"
@@ -1227,133 +1227,141 @@
   dependencies:
     conventional-changelog-conventionalcommits "^5.0.0"
 
-"@commitlint/config-validator@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/config-validator/-/config-validator-17.0.0.tgz#49ab09f3ca0ac3449e79ea389cb4942423162ac0"
-  integrity sha512-78IQjoZWR4kDHp/U5y17euEWzswJpPkA9TDL5F6oZZZaLIEreWzrDZD5PWtM8MsSRl/K2LDU/UrzYju2bKLMpA==
+"@commitlint/config-validator@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-validator/-/config-validator-17.4.4.tgz#d0742705719559a101d2ee49c0c514044af6d64d"
+  integrity sha512-bi0+TstqMiqoBAQDvdEP4AFh0GaKyLFlPPEObgI29utoKEYoPQTvF0EYqIwYYLEoJYhj5GfMIhPHJkTJhagfeg==
   dependencies:
-    "@commitlint/types" "^17.0.0"
-    ajv "^6.12.6"
+    "@commitlint/types" "^17.4.4"
+    ajv "^8.11.0"
 
-"@commitlint/ensure@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.0.0.tgz#781ff5f8870cb98ce4496d5c71649a4cd122a0e0"
-  integrity sha512-M2hkJnNXvEni59S0QPOnqCKIK52G1XyXBGw51mvh7OXDudCmZ9tZiIPpU882p475Mhx48Ien1MbWjCP1zlyC0A==
+"@commitlint/ensure@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.4.4.tgz#a36e7719bdb9c2b86c8b8c2e852b463a7bfda5fa"
+  integrity sha512-AHsFCNh8hbhJiuZ2qHv/m59W/GRE9UeOXbkOqxYMNNg9pJ7qELnFcwj5oYpa6vzTSHtPGKf3C2yUFNy1GGHq6g==
+  dependencies:
+    "@commitlint/types" "^17.4.4"
+    lodash.camelcase "^4.3.0"
+    lodash.kebabcase "^4.1.1"
+    lodash.snakecase "^4.1.1"
+    lodash.startcase "^4.4.0"
+    lodash.upperfirst "^4.3.1"
+
+"@commitlint/execute-rule@^17.4.0":
+  version "17.4.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-17.4.0.tgz#4518e77958893d0a5835babe65bf87e2638f6939"
+  integrity sha512-LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA==
+
+"@commitlint/format@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-17.4.4.tgz#0f6e1b4d7a301c7b1dfd4b6334edd97fc050b9f5"
+  integrity sha512-+IS7vpC4Gd/x+uyQPTAt3hXs5NxnkqAZ3aqrHd5Bx/R9skyCAWusNlNbw3InDbAK6j166D9asQM8fnmYIa+CXQ==
   dependencies:
-    "@commitlint/types" "^17.0.0"
-    lodash "^4.17.19"
-
-"@commitlint/execute-rule@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-17.0.0.tgz#186e9261fd36733922ae617497888c4bdb6e5c92"
-  integrity sha512-nVjL/w/zuqjCqSJm8UfpNaw66V9WzuJtQvEnCrK4jDw6qKTmZB+1JQ8m6BQVZbNBcwfYdDNKnhIhqI0Rk7lgpQ==
+    "@commitlint/types" "^17.4.4"
+    chalk "^4.1.0"
 
-"@commitlint/format@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-17.0.0.tgz#2c991ac0df3955fe5d7d4d733967bd17e6cfd9e0"
-  integrity sha512-MZzJv7rBp/r6ZQJDEodoZvdRM0vXu1PfQvMTNWFb8jFraxnISMTnPBWMMjr2G/puoMashwaNM//fl7j8gGV5lA==
+"@commitlint/is-ignored@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.4.4.tgz#82e03f1abe2de2c0c8c162a250b8d466225e922b"
+  integrity sha512-Y3eo1SFJ2JQDik4rWkBC4tlRIxlXEFrRWxcyrzb1PUT2k3kZ/XGNuCDfk/u0bU2/yS0tOA/mTjFsV+C4qyACHw==
   dependencies:
-    "@commitlint/types" "^17.0.0"
-    chalk "^4.1.0"
+    "@commitlint/types" "^17.4.4"
+    semver "7.3.8"
 
-"@commitlint/is-ignored@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.0.0.tgz#64f53517b390689e58aa3c29fbf1e05b7d4fbd65"
-  integrity sha512-UmacD0XM/wWykgdXn5CEWVS4XGuqzU+ZGvM2hwv85+SXGnIOaG88XHrt81u37ZeVt1riWW+YdOxcJW6+nd5v5w==
-  dependencies:
-    "@commitlint/types" "^17.0.0"
-    semver "7.3.7"
-
-"@commitlint/lint@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.0.0.tgz#38ef61e0e977d738f738233fbcdf33a5fc04cf96"
-  integrity sha512-5FL7VLvGJQby24q0pd4UdM8FNFcL+ER1T/UBf8A9KRL5+QXV1Rkl6Zhcl7+SGpGlVo6Yo0pm6aLW716LVKWLGg==
-  dependencies:
-    "@commitlint/is-ignored" "^17.0.0"
-    "@commitlint/parse" "^17.0.0"
-    "@commitlint/rules" "^17.0.0"
-    "@commitlint/types" "^17.0.0"
-
-"@commitlint/load@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.0.0.tgz#0bbefe6d8b99276714c5ea8ef32de2bd2f082698"
-  integrity sha512-XaiHF4yWQOPAI0O6wXvk+NYLtJn/Xb7jgZEeKd4C1ZWd7vR7u8z5h0PkWxSr0uLZGQsElGxv3fiZ32C5+q6M8w==
-  dependencies:
-    "@commitlint/config-validator" "^17.0.0"
-    "@commitlint/execute-rule" "^17.0.0"
-    "@commitlint/resolve-extends" "^17.0.0"
-    "@commitlint/types" "^17.0.0"
-    "@types/node" ">=12"
+"@commitlint/lint@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.4.4.tgz#0ecd70b44ec5f4823c2e00e0c4b04ebd41d42856"
+  integrity sha512-qgkCRRFjyhbMDWsti/5jRYVJkgYZj4r+ZmweZObnbYqPUl5UKLWMf9a/ZZisOI4JfiPmRktYRZ2JmqlSvg+ccw==
+  dependencies:
+    "@commitlint/is-ignored" "^17.4.4"
+    "@commitlint/parse" "^17.4.4"
+    "@commitlint/rules" "^17.4.4"
+    "@commitlint/types" "^17.4.4"
+
+"@commitlint/load@^17.5.0":
+  version "17.5.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.5.0.tgz#be45dbbb50aaf5eb7e8e940e1e0d6171d1426bab"
+  integrity sha512-l+4W8Sx4CD5rYFsrhHH8HP01/8jEP7kKf33Xlx2Uk2out/UKoKPYMOIRcDH5ppT8UXLMV+x6Wm5osdRKKgaD1Q==
+  dependencies:
+    "@commitlint/config-validator" "^17.4.4"
+    "@commitlint/execute-rule" "^17.4.0"
+    "@commitlint/resolve-extends" "^17.4.4"
+    "@commitlint/types" "^17.4.4"
+    "@types/node" "*"
     chalk "^4.1.0"
-    cosmiconfig "^7.0.0"
-    cosmiconfig-typescript-loader "^2.0.0"
-    lodash "^4.17.19"
+    cosmiconfig "^8.0.0"
+    cosmiconfig-typescript-loader "^4.0.0"
+    lodash.isplainobject "^4.0.6"
+    lodash.merge "^4.6.2"
+    lodash.uniq "^4.5.0"
     resolve-from "^5.0.0"
-    typescript "^4.6.4"
+    ts-node "^10.8.1"
+    typescript "^4.6.4 || ^5.0.0"
 
-"@commitlint/message@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-17.0.0.tgz#ae0f8ec6a3e5c8d369792a2c391952c7596cca73"
-  integrity sha512-LpcwYtN+lBlfZijHUdVr8aNFTVpHjuHI52BnfoV01TF7iSLnia0jttzpLkrLmI8HNQz6Vhr9UrxDWtKZiMGsBw==
+"@commitlint/message@^17.4.2":
+  version "17.4.2"
+  resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-17.4.2.tgz#f4753a79701ad6db6db21f69076e34de6580e22c"
+  integrity sha512-3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q==
 
-"@commitlint/parse@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.0.0.tgz#6d508a1e2aec76f348a447994f26e9b749c02091"
-  integrity sha512-cKcpfTIQYDG1ywTIr5AG0RAiLBr1gudqEsmAGCTtj8ffDChbBRxm6xXs2nv7GvmJN7msOt7vOKleLvcMmRa1+A==
+"@commitlint/parse@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.4.4.tgz#8311b12f2b730de6ea0679ae2a37b386bcc5b04b"
+  integrity sha512-EKzz4f49d3/OU0Fplog7nwz/lAfXMaDxtriidyGF9PtR+SRbgv4FhsfF310tKxs6EPj8Y+aWWuX3beN5s+yqGg==
   dependencies:
-    "@commitlint/types" "^17.0.0"
+    "@commitlint/types" "^17.4.4"
     conventional-changelog-angular "^5.0.11"
     conventional-commits-parser "^3.2.2"
 
-"@commitlint/read@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-17.0.0.tgz#8ab01cf2f27350d8f81f21690962679a7cae5abf"
-  integrity sha512-zkuOdZayKX3J6F6mPnVMzohK3OBrsEdOByIqp4zQjA9VLw1hMsDEFQ18rKgUc2adkZar+4S01QrFreDCfZgbxA==
+"@commitlint/read@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-17.4.4.tgz#de6ec00aad827764153009aa54517e3df2154555"
+  integrity sha512-B2TvUMJKK+Svzs6eji23WXsRJ8PAD+orI44lVuVNsm5zmI7O8RSGJMvdEZEikiA4Vohfb+HevaPoWZ7PiFZ3zA==
   dependencies:
-    "@commitlint/top-level" "^17.0.0"
-    "@commitlint/types" "^17.0.0"
-    fs-extra "^10.0.0"
+    "@commitlint/top-level" "^17.4.0"
+    "@commitlint/types" "^17.4.4"
+    fs-extra "^11.0.0"
     git-raw-commits "^2.0.0"
+    minimist "^1.2.6"
 
-"@commitlint/resolve-extends@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.0.0.tgz#3a40ee08184b984acf475ebc962641f435e3a639"
-  integrity sha512-wi60WiJmwaQ7lzMXK8Vbc18Hq9tE2j/6iv2AFfPUGV7fvfY6Sf1iNKuUHirSqR0fquUyufIXe4y/K9A6LVIIvw==
+"@commitlint/resolve-extends@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.4.4.tgz#8f931467dea8c43b9fe38373e303f7c220de6fdc"
+  integrity sha512-znXr1S0Rr8adInptHw0JeLgumS11lWbk5xAWFVno+HUFVN45875kUtqjrI6AppmD3JI+4s0uZlqqlkepjJd99A==
   dependencies:
-    "@commitlint/config-validator" "^17.0.0"
-    "@commitlint/types" "^17.0.0"
+    "@commitlint/config-validator" "^17.4.4"
+    "@commitlint/types" "^17.4.4"
     import-fresh "^3.0.0"
-    lodash "^4.17.19"
+    lodash.mergewith "^4.6.2"
     resolve-from "^5.0.0"
     resolve-global "^1.0.0"
 
-"@commitlint/rules@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.0.0.tgz#4eecc5d28cabbc5f3f73838fb02592b551f9bf62"
-  integrity sha512-45nIy3dERKXWpnwX9HeBzK5SepHwlDxdGBfmedXhL30fmFCkJOdxHyOJsh0+B0RaVsLGT01NELpfzJUmtpDwdQ==
+"@commitlint/rules@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.4.4.tgz#9b33f41e5eb529f916396bac7c62e61f0edd6791"
+  integrity sha512-0tgvXnHi/mVcyR8Y8mjTFZIa/FEQXA4uEutXS/imH2v1UNkYDSEMsK/68wiXRpfW1euSgEdwRkvE1z23+yhNrQ==
   dependencies:
-    "@commitlint/ensure" "^17.0.0"
-    "@commitlint/message" "^17.0.0"
-    "@commitlint/to-lines" "^17.0.0"
-    "@commitlint/types" "^17.0.0"
+    "@commitlint/ensure" "^17.4.4"
+    "@commitlint/message" "^17.4.2"
+    "@commitlint/to-lines" "^17.4.0"
+    "@commitlint/types" "^17.4.4"
     execa "^5.0.0"
 
-"@commitlint/to-lines@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-17.0.0.tgz#5766895836b8085b099a098482f88a03f070b411"
-  integrity sha512-nEi4YEz04Rf2upFbpnEorG8iymyH7o9jYIVFBG1QdzebbIFET3ir+8kQvCZuBE5pKCtViE4XBUsRZz139uFrRQ==
+"@commitlint/to-lines@^17.4.0":
+  version "17.4.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-17.4.0.tgz#9bd02e911e7d4eab3fb4a50376c4c6d331e10d8d"
+  integrity sha512-LcIy/6ZZolsfwDUWfN1mJ+co09soSuNASfKEU5sCmgFCvX5iHwRYLiIuoqXzOVDYOy7E7IcHilr/KS0e5T+0Hg==
 
-"@commitlint/top-level@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-17.0.0.tgz#ebd0df4c703c026c2fbdc20fa746836334f4ed15"
-  integrity sha512-dZrEP1PBJvodNWYPOYiLWf6XZergdksKQaT6i1KSROLdjf5Ai0brLOv5/P+CPxBeoj3vBxK4Ax8H1Pg9t7sHIQ==
+"@commitlint/top-level@^17.4.0":
+  version "17.4.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-17.4.0.tgz#540cac8290044cf846fbdd99f5cc51e8ac5f27d6"
+  integrity sha512-/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g==
   dependencies:
     find-up "^5.0.0"
 
-"@commitlint/types@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-17.0.0.tgz#3b4604c1a0f06c340ce976e6c6903d4f56e3e690"
-  integrity sha512-hBAw6U+SkAT5h47zDMeOu3HSiD0SODw4Aq7rRNh1ceUmL7GyLKYhPbUvlRWqZ65XjBLPHZhFyQlRaPNz8qvUyQ==
+"@commitlint/types@^17.4.4":
+  version "17.4.4"
+  resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-17.4.4.tgz#1416df936e9aad0d6a7bbc979ecc31e55dade662"
+  integrity sha512-amRN8tRLYOsxRr6mTnGGGvB5EmW/4DDjLMgiwK3CCVEmN6Sr/6xePGEpWaspKkckILuUORCwe6VfDBw6uj4axQ==
   dependencies:
     chalk "^4.1.0"
 
@@ -1976,7 +1984,7 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
-"@types/node@*", "@types/node@>=12":
+"@types/node@*":
   version "18.14.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.0.tgz#94c47b9217bbac49d4a67a967fdcdeed89ebb7d0"
   integrity sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A==
@@ -1986,11 +1994,6 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
 "@types/prettier@^2.1.5":
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.3.tgz#68ada76827b0010d0db071f739314fa429943d0a"
@@ -2106,7 +2109,7 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.6:
+ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2126,6 +2129,16 @@ ajv@^8.0.1:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
+ajv@^8.11.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -2854,24 +2867,20 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-cosmiconfig-typescript-loader@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-2.0.1.tgz#5622bb1eb87d293570bcc3a57f406940e0960113"
-  integrity sha512-B9s6sX/omXq7I6gC6+YgLmrBFMJhPWew7ty/X5Tuwtd2zOSgWaUdXjkuVwbe3qqcdETo60+1nSVMekq//LIXVA==
-  dependencies:
-    cosmiconfig "^7"
-    ts-node "^10.8.0"
+cosmiconfig-typescript-loader@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz#c4259ce474c9df0f32274ed162c0447c951ef073"
+  integrity sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==
 
-cosmiconfig@^7, cosmiconfig@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
-  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+cosmiconfig@^8.0.0:
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689"
+  integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==
   dependencies:
-    "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
     parse-json "^5.0.0"
     path-type "^4.0.0"
-    yaml "^1.10.0"
 
 create-require@^1.1.0:
   version "1.1.1"
@@ -3612,7 +3621,7 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-fs-extra@10.0.0, fs-extra@^10.0.0:
+fs-extra@10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
   integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
@@ -3621,6 +3630,15 @@ fs-extra@10.0.0, fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@^11.0.0:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
+  integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -4740,6 +4758,13 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 js2xmlparser@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
@@ -5007,6 +5032,11 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -5022,16 +5052,56 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
+lodash.isfunction@^3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
+  integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
+
+lodash.kebabcase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
+  integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
+lodash.mergewith@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
+  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
+
+lodash.snakecase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
+  integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==
+
+lodash.startcase@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8"
+  integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==
+
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
   integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
+
+lodash.upperfirst@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
+  integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
+
 lodash@^4.0.1, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -6174,10 +6244,10 @@ semver@7.0.0, semver@~7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+semver@7.3.8, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -6186,13 +6256,6 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-  dependencies:
-    lru-cache "^6.0.0"
-
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -6667,10 +6730,10 @@ ts-map@^1.0.3:
   resolved "https://registry.yarnpkg.com/ts-map/-/ts-map-1.0.3.tgz#1c4d218dec813d2103b7e04e4bcf348e1471c1ff"
   integrity sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==
 
-ts-node@^10.8.0:
-  version "10.8.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.8.1.tgz#ea2bd3459011b52699d7e88daa55a45a1af4f066"
-  integrity sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==
+ts-node@^10.8.1:
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
   dependencies:
     "@cspotcode/source-map-support" "^0.8.0"
     "@tsconfig/node10" "^1.0.7"
@@ -6774,10 +6837,10 @@ typescript@^4.5.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
   integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
-typescript@^4.6.4:
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
-  integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
+"typescript@^4.6.4 || ^5.0.0":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.2.tgz#891e1a90c5189d8506af64b9ef929fca99ba1ee5"
+  integrity sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -7137,11 +7200,6 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
 yaml@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.3.tgz#9b3a4c8aff9821b696275c79a8bee8399d945207"