diff --git a/app/views/companies/index.html.erb b/app/views/companies/index.html.erb
index bd442752..0caf7af9 100644
--- a/app/views/companies/index.html.erb
+++ b/app/views/companies/index.html.erb
@@ -3,7 +3,7 @@
   <div class="relative z-10 max-w-7xl mx-auto">
     <div class="inline-flex items-center gap-2 bg-white/15 border border-white/20 rounded-full px-4 py-1.5 text-white/80 text-xs font-bold uppercase tracking-widest mb-4">
       <i class="fa-brands fa-gem text-xs"></i>
-      Built with Ruby
+      <%= t('footer.built_with_ruby') %>
     </div>
     <h1 class="text-white font-extrabold text-4xl lg:text-5xl mb-3"><%= t('companies.index.title') %></h1>
     <p class="text-white/75 text-lg max-w-2xl mb-6"><%= t('companies.index.subtitle') %></p>
diff --git a/app/views/companies/new.html.erb b/app/views/companies/new.html.erb
index 7de968ab..613defe9 100644
--- a/app/views/companies/new.html.erb
+++ b/app/views/companies/new.html.erb
@@ -1,4 +1,4 @@
-<div class="min-h-screen py-14 px-4" style="background: linear-gradient(135deg, #FDF6F0 0%, #fff 100%);">
+<div class="min-h-screen py-14 px-4">
   <div class="max-w-2xl mx-auto">
 
     <%# Back link %>
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 573a8401..dd2674e9 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -31,7 +31,7 @@
 
       <div class="pt-2">
         <%= f.button :button, t('devise.views.confirmations.new.submit_button'),
-            class: 'w-full arc-btn-ruby justify-center text-base py-3.5 cursor-pointer' %>
+            class: 'w-full justify-center text-base py-3.5 cursor-pointer' %>
       </div>
     <% end %>
 
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 35b1121b..d02ff2b5 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -25,7 +25,7 @@
 
       <div class="pt-2">
         <%= f.button :button, t('devise.views.passwords.new.submit_button'),
-            class: 'w-full arc-btn-ruby justify-center text-base py-3.5 cursor-pointer' %>
+            class: 'w-full justify-center text-base py-3.5 cursor-pointer' %>
       </div>
     <% end %>
 
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 1a457d5c..74161a14 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -126,7 +126,7 @@
 
       <div class="pt-2">
         <%= f.button :button, t('devise.views.registrations.new.submit_button'),
-                     class: 'w-full arc-btn-ruby justify-center text-base py-3.5 cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed',
+                     class: 'w-full justify-center text-base py-3.5 cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed',
                      disabled: true %>
       </div>
     <% end %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 82cab848..ebe69aab 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -78,7 +78,7 @@
 
       <div class="pt-2">
         <%= f.button :button, t('devise.views.sessions.new.submit_button'),
-            class: 'w-full arc-btn-ruby justify-center text-base py-3.5 cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed',
+            class: 'w-full justify-center text-base py-3.5 cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed',
             disabled: true %>
       </div>
     <% end %>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index 1b805730..a9706be8 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -25,7 +25,7 @@
 
       <div class="pt-2">
         <%= f.button :button, t("devise.unlocks.resend_instructions"),
-            class: 'w-full arc-btn-ruby justify-center text-base py-3.5 cursor-pointer' %>
+            class: 'w-full justify-center text-base py-3.5 cursor-pointer' %>
       </div>
     <% end %>
 
diff --git a/app/views/landing/code_of_conduct.html.erb b/app/views/landing/code_of_conduct.html.erb
index 25d75805..053e8a49 100644
--- a/app/views/landing/code_of_conduct.html.erb
+++ b/app/views/landing/code_of_conduct.html.erb
@@ -210,7 +210,7 @@
       <%= t('code_of_conduct.cta_desc', default: 'Reach out to our organizers privately. Reports are kept confidential.') %>
     </p>
     <div class="flex flex-wrap justify-center gap-4 pt-2">
-      <%= link_to "mailto:organisers@rubycommunity.africa", class: "btn btn-error gap-2 shadow-md hover:shadow-lg transition-all" do %>
+      <%= mail_to "mailto:organisers@rubycommunity.africa",data: { turbo: false }, class: "btn btn-error gap-2 shadow-md hover:shadow-lg transition-all" do %>
         <i class="fa-solid fa-envelope text-sm"></i>
         <%= t('common.actions.contact_organizers', default: 'Contact Organizers') %>
       <% end %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index f4304e76..901b3638 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -58,11 +58,12 @@
                         class: "inline-block text-base-content/70 hover:text-red-500 dark:hover:text-red-400 transition-colors duration-200" %>
           </li>
           <li>
-            <%= link_to "Built with Ruby", built_with_ruby_path,
+            <%= link_to t('footer.built_with_ruby'), built_with_ruby_path,
                         class: "inline-block text-base-content/70 hover:text-red-500 dark:hover:text-red-400 transition-colors duration-200" %>
           </li>
-          <li>
-            <%= link_to t('footer.sponsor'), 'mailto:organisers@rubycommunity.africa',
+<!--          TODO: Replace with sponsor page/ contact page-->
+          <li style="display: none;">
+            <%= mail_to t('footer.sponsor'), 'mailto:organisers@rubycommunity.africa',
                         class: "inline-block text-base-content/70 hover:text-red-500 dark:hover:text-red-400 transition-colors duration-200" %>
           </li>
           <% if FeatureFlag.find_by(name: 'members').try(:enabled) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16b3c9da..771ce6e3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -333,6 +333,7 @@ en:
     resources: "Resources"
     home: "Home"
     about: "About"
+    built_with_ruby: "Built with Ruby"
     about_arc: "About ARC"
     events: "Events"
     code_of_conduct: "Code of Conduct"
@@ -379,6 +380,7 @@ en:
     sponsor: "Sponsor"
     members: "Members"
     about: "About"
+    built_with_ruby: "Built with Ruby"
     contact_us: "Contact Us"
     code_of_conduct: "Code of conduct"
     connect: "Connect"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5a1d10fd..d43d46ce 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -331,6 +331,7 @@ fr:
     resources: "Ressources"
     home: "Accueil"
     about: "À propos"
+    built_with_ruby: "Développé avec Ruby"
     about_arc: "À propos d'ARC"
     events: "Événements"
     code_of_conduct: "Code de Conduite"
@@ -377,6 +378,7 @@ fr:
     sponsor: "Sponsor"
     members: "Membres"
     about: "À propos"
+    built_with_ruby: "Développé avec Ruby"
     contact_us: "Nous contacter"
     code_of_conduct: "Code de conduite"
     connect: "Se connecter"
diff --git a/config/locales/sw.yml b/config/locales/sw.yml
index 64ff8cfe..07251389 100644
--- a/config/locales/sw.yml
+++ b/config/locales/sw.yml
@@ -330,6 +330,7 @@ sw:
     resources: "Miradi"
     home: "Nyumbani"
     about: "Kuhusu"
+    built_with_ruby: "Imetengenezwe kwa Ruby"
     about_arc: "Kuhusu ARC"
     events: "Matukio"
     code_of_conduct: "Kanuni za maadili"
@@ -375,6 +376,7 @@ sw:
     sponsor: "Mfadhili"
     members: "Wanachama"
     about: "Kuhusu"
+    built_with_ruby: "Imetengenezwe kwa Ruby"
     contact_us: "Wasiliana Nasi"
     code_of_conduct: "Kanuni za maadili"
     connect: "Unganisha"