diff --git a/Gemfile.lock b/Gemfile.lock
index bdde3b3..050db2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -404,6 +404,7 @@ GEM
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0, < 3)
+    slop (3.6.0)
     smart_properties (1.17.0)
     snaky_hash (2.0.1)
       hashie
diff --git a/app/controllers/campaigns_controller.rb b/app/controllers/campaigns_controller.rb
index 2f9d11e..8c6cc70 100644
--- a/app/controllers/campaigns_controller.rb
+++ b/app/controllers/campaigns_controller.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 class CampaignsController < ApplicationController
-  before_action :set_repository, only: %i[new create edit]
+  before_action :authenticate_user!, only: %i[new create edit update]
+  before_action :set_repository, only: %i[new create edit update]
   before_action :check_repository_ownership!, only: %i[new create edit]
-  before_action :set_campaign, only: %i[edit update destroy]
+  before_action :set_campaign, only: %i[edit update]
 
   def show
     @campaign = Campaign.find(params[:id])
@@ -11,7 +12,7 @@ def show
     @accepted_currencies = if @campaign.accepted_currencies == 'all'
                              Campaign::ALL_CURRENCIES
                            else
-                             @campaign.accepted_currencies.split(',')
+                             @campaign.accepted_currencies
                            end
   end
 
@@ -24,65 +25,94 @@ def create
     @campaign = @repository.build_campaign(campaign_params)
     @campaign.receiving_wallet = current_user.wallet
 
-    respond_to do |format|
-      if @campaign.save
-        format.html { redirect_to user_repository_campaign_path(@repository.user, @repository, @campaign), notice: 'Campaign was successfully created.' }
-        format.json { render json: @campaign, status: :created }
-      else
-        log_errors(@campaign)
-        Rails.logger.error(@campaign.errors.full_messages.to_sentence)
-        format.html { render :new, alert: @campaign.errors.full_messages.join('. ') }
-        format.json { render json: { errors: @campaign.errors.full_messages }, status: :unprocessable_entity }
-      end
+    process_accepted_currencies(@campaign)
+
+    if @campaign.save
+      redirect_to user_repository_campaign_path(current_user, @repository, @campaign), notice: 'Campaign was successfully created.'
+    else
+      flash.now[:alert] = @campaign.errors.full_messages.join('. ')
+      Rails.logger.debug "Campaign save failed. Errors: #{@campaign.errors.full_messages}"
+      render :new
     end
   end
 
-  def edit; end
+  def edit
+    @repo_name = @campaign.repository
+    @accepted_currencies = @campaign.accepted_currencies
+  end
 
   def update
+    process_accepted_currencies(@campaign)
+
     if @campaign.update(campaign_params)
-      redirect_to user_repository_campaign_path(@repository.user, @repository, @campaign), notice: 'Campaign was successfully updated.'
+      redirect_to user_repository_campaign_path(@repository.user, @repository, @campaign), notice: 'Campaign updated successfully!'
     else
+      flash.now[:alert] = @campaign.errors.full_messages.join('. ')
       render :edit
     end
   end
 
-  def destroy
-    @campaign.destroy
-    redirect_to campaigns_url, notice: 'Campaign was successfully destroyed.'
-  end
-
   private
 
   def set_campaign
-    @campaign = Campaign.find_by(id: params[:id])
-    redirect_to root_path, alert: "Campaign not found with id: #{params[:id]}." unless @campaign
+    @campaign = current_user.campaigns.find(params[:id])
   end
 
   def set_repository
-    @repository = Repository.find(params[:repository_id])
-    redirect_to root_path, alert: 'Repository not found.' unless @repository
+    if action_name == 'new' || action_name == 'create'
+      @repository = current_user.repositories.find_by(id: params[:repository_id])
+
+      if @repository.nil?
+        redirect_to root_path, alert: 'Repository not found or does not belong to you.'
+        return
+      end
+    else
+      @campaign = Campaign.find_by(id: params[:id])
+      if @campaign.nil?
+        redirect_to root_path, alert: "Campaign not found with id: #{params[:id]}."
+        return
+      end
+      @repository = @campaign.repository
+    end
+
+    Rails.logger.debug "Repository set in #{action_name} action: #{@repository.inspect}"
+  end
+
+  def find_wallet_for_repo_owner(repository)
+    owner = User.find_by(uid: repository.owner_login)
+    owner&.wallet
   end
 
   def check_repository_ownership!
+    Rails.logger.debug "Current user: #{current_user.inspect}"
+    Rails.logger.debug "Repository user: #{@repository.user.inspect}"
     return if current_user == @repository.user
 
     flash[:alert] = 'You are not authorized to create a campaign for this repository'
     redirect_to root_path
   end
 
-  def log_errors(campaign)
-    Rails.logger.debug campaign.errors.full_messages.to_sentence
+  def process_accepted_currencies(campaign)
+    currencies_param = params[:campaign][:accepted_currencies]
+
+    return unless currencies_param.is_a?(String)
+
+    logger.debug "Accepted currencies before processing: #{currencies_param}"
+
+    processed_currencies = currencies_param.gsub(/[{}"]/, '').split(',').map(&:strip).reject(&:empty?)
+
+    logger.debug "Accepted currencies after processing: #{processed_currencies}"
+
+    campaign.accepted_currencies = processed_currencies
   end
 
-  def find_wallet_for_repo_owner(repository)
-    owner = User.find_by(uid: repository.owner_login)
-    owner&.wallet
+  def log_errors(campaign)
+    Rails.logger.debug campaign.errors.full_messages.to_sentence
   end
 
   def campaign_params
-    params.require(:campaign).permit(:title, :description, :repository_id, :receiving_wallet_id, :contribution_cadence).tap do |whitelisted|
-      whitelisted[:accepted_currencies] = params[:campaign][:accepted_currencies].split(',') if params[:campaign][:accepted_currencies].present?
+    params.require(:campaign).permit(:repository_id, :receiving_wallet_id, :title, :description, :contribution_cadence).tap do |whitelisted|
+      whitelisted[:accepted_currencies] = params[:campaign][:accepted_currencies].is_a?(String) ? params[:campaign][:accepted_currencies].split(',') : params[:campaign][:accepted_currencies]
     end
   end
 end
diff --git a/app/controllers/contributions_controller.rb b/app/controllers/contributions_controller.rb
index 3f8f0ed..40e6287 100644
--- a/app/controllers/contributions_controller.rb
+++ b/app/controllers/contributions_controller.rb
@@ -8,32 +8,41 @@ def new
     pp 'new action'
     @campaign = Campaign.find(params[:campaign_id])
     pp '++++++++++++++++++++'
+    
     pp @campaign
     pp '++++++++++++++++++++'
+    @receiving_wallet = @campaign.receiving_wallet.address
+    @sending_wallet = current_user.wallet.address
+
     @contribution = Contribution.new
     @accepted_currencies = @campaign.accepted_currencies.split(',')
-  end
+    # we need receiving wallet and sending wallet
+    # receiving is connected to campaign, owner of campaign has a wallet in db
+    # sending wallet is the current_user. what happens is this is your campaign? any different display?
+    #  if this is your campaign, you should not be able to send funds, because that would be redundant and only cost gas
+    #  if this is not your campaign, you should be able to send funds
+    # if this is your campaign, instead of contibute button could display a share this campaign button 
+    #  that would copy the url to the clipboard
+
+#  <p id="wallet-address"><%= @sending_wallet.address if @user.wallet.present? %></p>
+#         <% unless @user.wallet.present? %>
+#           <%= button_tag "Add Wallet", type: "button", class: "text-blue-600 hover:text-blue-800", data: { action: "wallet#openConnectModal" } %>
+#         <% end %>
+#       </div>
+#     <% end %> 
+    end
 
   def create
     pp 'create contrib'
-  end
+    @receiving_wallet = @campaign.receiving_wallet_id
+    @sending_wallet = current_user.wallet_id
 
-  private
+    p @receiving_wallet
+    p @sending_wallet
 
-  def set_receiving_wallet
-    @campaign = Campaign.find(params[:campaign_id])
-    pp @campaign
-
-    @receiving_wallet = Wallet.find_by(id: @campaign.receiving_wallet_id)
-    pp @receiving_wallet
-    @receiving_wallet_address = @receiving_wallet&.address
   end
 
-  def set_user
-    pp 'set user in contrib'
-    @user = current_user
-    pp @user.wallet.address
-  end
+  private
 
   def contributions_params
     params.require(:contribution).permit(:contribution_cadence, :repo_identifier, :receiving_wallet_id, accepted_currencies: [])
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 107a121..27f65ff 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -5,16 +5,9 @@ class HomeController < ApplicationController
 
   def index
     fetch_user_data_from_database
-    prepare_campaigns_mapping
-
-    if @github_user_data
-      respond_to do |format|
-        format.html
-        format.json { render_github_data_as_json }
-      end
-    else
-      handle_github_data_failure
-    end
+    # prepare_campaigns_mapping
+
+    handle_github_data_failure unless @github_user_data
   end
 
   private
@@ -28,21 +21,17 @@ def fetch_user_data_from_database
     @repositories = current_user.repositories.select(:id, :full_name, :name, :html_url, :description)
   end
 
-  def prepare_campaigns_mapping
-    repository_ids = @repositories.pluck(:id)
+  # def prepare_campaigns_mapping
+  #   repository_ids = @repositories.pluck(:id)
 
-    campaigns = Campaign.where(repository_id: repository_ids)
-    @campaigns_by_repository_id = campaigns.index_by(&:repository_id)
-    logger.debug "Campaigns by Repo Identifier: #{@campaigns_by_repository_id.inspect}"
-  end
+  #   campaigns = Campaign.where(repository_id: repository_ids)
+  #   @campaigns_by_repository_id = campaigns.index_by(&:repository_id)
+  #   logger.debug "Campaigns by Repo Identifier: #{@campaigns_by_repository_id.inspect}"
 
-  def render_github_data_as_json
-    render json: {
-      user: @github_user_data,
-      avatar: @avatar,
-      repositories: @repositories
-    }
-  end
+  #   @respositories_with_campaigns = @repositories.map do |repository|
+  #     { repository: repository, campaign: @campaigns_by_repository_id[repository.id] }
+  #   end
+  # end
 
   def handle_github_data_failure
     flash[:alert] = 'Failed to retrieve GitHub data. Please try again later.'
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 86a204a..49ae4f7 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -1,6 +1,24 @@
 # frozen_string_literal: true
 
 class RepositoriesController < ApplicationController
+  before_action :authenticate_user!, only: %i[index show]
+
   def index
+    @repositories = current_user.repositories.includes(:campaigns)
+    # prepare_campaigns_mapping
+  end
+
+  private
+
+  def prepare_campaigns_mapping
+    repository_ids = @repositories.pluck(:id)
+
+    campaigns = Campaign.where(repository_id: repository_ids)
+    @campaigns_by_repository_id = campaigns.index_by(&:repository_id)
+    logger.debug "Campaigns by Repo Identifier: #{@campaigns_by_repository_id.inspect}"
+
+    @respositories_with_campaigns = @repositories.map do |repository|
+      { repository:, campaign: @campaigns_by_repository_id[repository.id] }
+    end
   end
 end
diff --git a/app/controllers/users/callbacks_controller.rb b/app/controllers/users/callbacks_controller.rb
index 118c383..2d5b2cf 100644
--- a/app/controllers/users/callbacks_controller.rb
+++ b/app/controllers/users/callbacks_controller.rb
@@ -10,10 +10,12 @@ def github
         Rails.logger.debug "User persisted: #{@user.inspect}"
         sign_in_and_redirect @user, event: :authentication
         set_flash_message(:notice, :success, kind: 'GitHub') if is_navigational_format?
+        SyncReposJob.perform_later(@user.id)
       else
         Rails.logger.debug "User could not be persisted: #{@user.errors.full_messages.join(', ')}"
-        session['devise.github_data'] = request.env['omniauth.auth'].except('extra')
-        redirect_to root_path
+        # session['devise.github_data'] = request.env['omniauth.auth'].except('extra')
+        flash[:alert] = 'Failed to sign in with GitHub. Please try again later.'
+        redirect_to new_user_session_path
       end
     end
   end
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
deleted file mode 100644
index b701be7..0000000
--- a/app/controllers/users/registrations_controller.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Users
-  class RegistrationsController < Devise::RegistrationsController
-    private
-
-    def signup_params
-      params.require(:user).permit(:name, :email, :password, :password_confirmation)
-    end
-
-    def account_update_params
-      params.require(:user).permit(:name, :email, :password, :password_confirmation, :current_password)
-    end
-  end
-end
diff --git a/app/javascript/controllers/currency_controller.js b/app/javascript/controllers/currency_controller.js
index 4be38fe..93cc4e9 100644
--- a/app/javascript/controllers/currency_controller.js
+++ b/app/javascript/controllers/currency_controller.js
@@ -9,7 +9,10 @@ export default class extends Controller {
   ];
 
   connect() {
-    this.selectedCurrencies = [];
+    this.selectedCurrencies = this.currencyButtonTargets
+      .filter((button) => button.classList.contains("bg-blue-500"))
+      .map((button) => button.dataset.currencyValue);
+
     this.updateAcceptedCurrenciesField();
     this.updateSelectAllState();
   }
@@ -21,8 +24,11 @@ export default class extends Controller {
 
     button.classList.toggle("bg-blue-500");
     button.classList.toggle("text-white");
+    button.classList.toggle("bg-white");
+    button.classList.toggle("text-black");
 
     const isSelected = button.classList.contains("bg-blue-500");
+
     if (isSelected) {
       if (!this.selectedCurrencies.includes(currency)) {
         this.selectedCurrencies.push(currency);
@@ -46,14 +52,15 @@ export default class extends Controller {
     this.currencyButtonTargets.forEach((button) => {
       button.classList.toggle("bg-blue-500", isChecked);
       button.classList.toggle("text-white", isChecked);
+      button.classList.toggle("bg-white", !isChecked);
+      button.classList.toggle("text-black", !isChecked);
       const currency = button.dataset.currencyValue;
       if (isChecked && !this.selectedCurrencies.includes(currency)) {
         this.selectedCurrencies.push(currency);
       } else if (!isChecked) {
-        const index = this.selectedCurrencies.indexOf(currency);
-        if (index !== -1) {
-          this.selectedCurrencies.splice(index, 1);
-        }
+        this.selectedCurrencies = this.selectedCurrencies.filter(
+          (c) => c !== currency
+        );
       }
     });
     this.updateAcceptedCurrenciesField();
@@ -61,6 +68,7 @@ export default class extends Controller {
 
   updateAcceptedCurrenciesField() {
     this.acceptedCurrenciesTarget.value = this.selectedCurrencies.join(",");
+    console.log(this.selectedCurrencies);
   }
 
   updateSelectAllState() {
diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 74f4b3c..62cc9cc 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -7,14 +7,21 @@ class Campaign < ApplicationRecord
 
   # Validations
   validates :title, presence: { message: 'must be provided and cannot be blank.' }
-  validates :description, presence: { message: 'must be provided and cannot be blank.' }
-  validates :accepted_currencies, length: { minimum: 1, message: 'must include at least one currency.' }
+  validates :accepted_currencies, length: { minimum: 1, message: 'must include at least one currency.' }, if: -> { accepted_currencies.present? }
+  validates :repository_id, uniqueness: { message: 'A campaign for this repository already exists' }
 
   # Constants
   ALL_CURRENCIES = %w[USDC BTC ETH].freeze
 
-  # Optional association indicator for UI logic or elsewhere
-  # def repo_centric?
-  #   repo_identifier.present?
-  # end
+  private
+
+  def process_accepted_currencies
+    currencies_param = params[:campaign][:accepted_currencies]
+
+    return unless currencies_param.is_a?(String)
+
+    processed_currencies = currencies_param.gsub(/[{}"]/, '').split(',').map(&:strip).reject(&:empty?)
+
+    params[:campaign][:accepted_currencies] = processed_currencies
+  end
 end
diff --git a/app/services/sync_repos_service.rb b/app/services/sync_repos_service.rb
index b00e866..e48ab82 100644
--- a/app/services/sync_repos_service.rb
+++ b/app/services/sync_repos_service.rb
@@ -14,7 +14,7 @@ def call
       Rails.logger.debug "GitHub API Response: #{response.code} - #{response.body}"
 
       repositories_data.each do |repository_data|
-        repository = Repository.find_or_create_by(repo_github_id: repository_data['id']) do |r|
+        repository = Repository.find_or_initialize_by(repo_github_id: repository_data['id']).tap do |r|
           r.user = @user
           r.name = repository_data['name']
           r.full_name = repository_data['full_name']
@@ -28,23 +28,7 @@ def call
           r.pushed_to_github_at = repository_data['pushed_at']
         end
 
-        Rails.logger.debug "Repository synced: #{repository.full_name}"
-
-        next unless repository.persisted? && repository.changed?
-
-        repository.update(
-          name: repository_data['name'],
-          full_name: repository_data['full_name'],
-          owner_login: repository_data['owner']['login'],
-          html_url: repository_data['html_url'],
-          description: repository_data['description'],
-          private: repository_data['private'],
-          fork: repository_data['fork'],
-          created_on_github_at: repository_data['created_at'],
-          updated_on_github_at: repository_data['updated_at'],
-          pushed_to_github_at: repository_data['pushed_at']
-        )
-        Rails.logger.debug "Repository updated and synced: #{repository.full_name}"
+        repository.save!
       end
     else
       Rails.logger.error "GitHub API Request failed: #{response.code} - #{response.message}"
diff --git a/app/views/campaigns/_form.html.erb b/app/views/campaigns/_form.html.erb
index e9ecb8b..2114313 100644
--- a/app/views/campaigns/_form.html.erb
+++ b/app/views/campaigns/_form.html.erb
@@ -1,7 +1,15 @@
 <div class="mt-5" data-controller="currency">
-  <h1 class="text-xl font-bold mb-4">
-    <%= @campaign.new_record? ? "Create a New Campaign for #{@repository.name}" : "Edit Campaign for #{@repository.name}" %>
-  </h1>
+  <% if @campaign.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@campaign.errors.count, "error") %> prohibited this campaign from being saved:</h2>
+      <ul>
+        <% @campaign.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
   <% unless current_user.wallet.present? %>
     <div
       data-controller="wallet"
@@ -16,6 +24,8 @@
   <% end %>
   <%= form_with(model: [current_user, @repository, @campaign], local: true, class: "space-y-4", data: { action: "submit->currency#handleSubmit", currency_target: "form" }) do |form| %>
     <%= form.hidden_field :repository_id, value: @repository.id %>
+    <%= form.hidden_field :accepted_currencies, id: "accepted_currencies", name: "campaign[accepted_currencies]",
+        data: { currency_target: "acceptedCurrencies" } %>
     <% if @campaign.errors.any? %>
       <div id="error_explanation" class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
         <strong class="font-bold">Oops!</strong>
@@ -33,7 +43,7 @@
     <div class="field">
       <%= form.label :creator, class: "block text-gray-700 text-sm font-bold mb-2" %>
       <p>
-        <%= "#{current_user.nickname}, project owner of #{@repository.name}, verified" %>
+        <%= "#{current_user.nickname}, project owner of #{@repository.full_name}, verified" %>
         <%= image_tag("verified-icon.svg", alt: "Verified Checkmark", class: "inline-block align-middle", style: "height: 20px; width: 20px;") %>
       </p>
     </div>
@@ -65,17 +75,16 @@
               currency_target: "currencyButton",
               currency_value: currency
             },
-            class: "currency-btn w-full p-2 border rounded text-center" %>
+            class: "currency-btn w-full p-2 border rounded text-center #{'bg-blue-500 text-white' if @campaign.accepted_currencies.include?(currency)} #{'bg-white text-black' unless @campaign.accepted_currencies.include?(currency)}" %>
         </div>
       <% end %>
-      <%= form.hidden_field :accepted_currencies, id: "accepted_currencies",
-        value: "", data: { currency_target: "acceptedCurrencies" } %>
     </div>
     <div class="mt-4">
       <div class="mt-4">
+        <%= form.label :contribution_cadence, 'Contribution Cadence', class: "block text-gray-700 text-sm font-bold mb-2" %>
         <%= form.select :contribution_cadence, ['both', 'recurring', 'one-time'], {}, {class: "shadow border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"} %>
       </div>
     </div>
-    <%= form.submit (@campaign.new_record? ? 'Create Campaign' : 'Save Campaign'), class: "bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" %>
+    <%= form.submit (@campaign.new_record? ? 'Create Campaign' : 'Update Campaign'), class: "bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" %>
   <% end %>
 </div>
diff --git a/app/views/campaigns/edit.html.erb b/app/views/campaigns/edit.html.erb
index 01addc1..3fc16b9 100644
--- a/app/views/campaigns/edit.html.erb
+++ b/app/views/campaigns/edit.html.erb
@@ -1,3 +1,7 @@
-<div class="mt-5">
-  <%= render 'form', campaign: @campaign %>
+<div class="mb-4">
+  <h1 class="text-xl font-bold">Edit Campaign for <%= @repository.name %></h1>
+  <div class="mt-5">
+    <%= render 'form', campaign: @campaign %>
+  </div>
 </div>
+
diff --git a/app/views/campaigns/new.html.erb b/app/views/campaigns/new.html.erb
index 460ad49..f6f1c25 100644
--- a/app/views/campaigns/new.html.erb
+++ b/app/views/campaigns/new.html.erb
@@ -1,3 +1,7 @@
-<div class="mt-5">
-  <%= render 'form', campaign: @campaign, repository: @repository %>
+<div class="mb-4">
+  <h1 class="text-xl font-bold">Create a new Campaign for <%= @repository.name %></h1>
+  <div class="mt-5">
+    <%= render 'form', campaign: @campaign %>
+  </div>
 </div>
+
diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb
index 6cf67bd..756532b 100644
--- a/app/views/campaigns/show.html.erb
+++ b/app/views/campaigns/show.html.erb
@@ -1,5 +1,3 @@
-
-
 <div class="flex justify-center items-center min-h-screen">
   <div class="w-full max-w-4xl px-4 py-8 bg-white">
     <%= button_to 'Home', root_path, method: :get, class: "bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded" %>
@@ -31,6 +29,11 @@
             <% end %>
           </p>
         </div>
+        <div>
+        <% if @repository.user == current_user %>
+          <%= link_to 'Edit Campaign', edit_user_repository_campaign_path(@repository.user, @repository, @campaign), class: "bg-blue-500 text-white px-4 py-2 rounded inline-block" %>
+        <% end %>
+        </div>
       </div>
       <div class="w-full md:w-1/2 px-2 ml-4">
         <%= render 'contributions/new', campaign: @campaign, contribution: Contribution.new, accepted_currencies: @campaign.accepted_currencies %>
diff --git a/app/views/contributions/_new.html.erb b/app/views/contributions/_new.html.erb
index ec05763..3859fc1 100644
--- a/app/views/contributions/_new.html.erb
+++ b/app/views/contributions/_new.html.erb
@@ -58,32 +58,28 @@
     <% end %>
   </div>
 
-  <div>
-    <strong>Receiving Wallet:</strong>
-    <p id="receiving-wallet-address" class="mb-4">
-      <%= @campaign.receiving_wallet.address %>
-    </p>
-  </div>
-
   <% if current_user %>
     <div class="mb-4" data-controller="wallet"
-        data-wallet-project-id-value="<%= Rails.application.credentials.dig(:wallet_connect, :project_id) %>"
-        data-wallet-user-id-value="<%= current_user.id %>"
-        data-wallet-csrf-token-value="<%= form_authenticity_token %>">
-      <div>
-        <strong>Your Wallet:</strong>
-        <% if current_user.wallet.present? %>
-          <p id="wallet-address" class="mb-12"
-            <%= current_user.wallet&.address %>>
-          </p>
-        <% else %>
-          <%= button_tag "Add Wallet", type: "button", class: "text-blue-600 hover:text-blue-800 mb-4", data: { action: "wallet#openConnectModal" } %>
-        <% end %>
-      </div>
+          data-wallet-project-id-value="<%= Rails.application.credentials.dig(:wallet_connect, :project_id) %>"
+          data-wallet-user-id-value="<%= current_user.id %>"
+          data-wallet-csrf-token-value="<%= form_authenticity_token %>">
+      <button data-wallet-target="openModal" data-action="click->wallet#openConnectModal">
+
+    <div class="mb-4">
+      <strong>Receiving Wallet (Campaign Owner):</strong>
+      <p><%= @campaign.receiving_wallet.address %></p>
+    </div>
+    <div class="mb-4">
+      <% if current_user.wallet.present? %>
+        <strong>Your Wallet (Sending):</strong>
+        <p><%= current_user.wallet.address %></p>
+      <% else %>
+        <p>No wallet associated with your account.</p>
+      <% end %>
     </div>
+
+    <%= button_tag "Support", 
+          data: { action: "contribution#contribute" }, 
+          class: "w-full p-2 bg-blue-500 text-white rounded" %>
   <% end %>
-  <%= button_tag "Support",
-    data: { action: "contribution#contribute" },
-    class: "w-full p-2 bg-blue-500 text-white rounded" %>
-  </div>
 </div>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 69da9e3..dac7e9e 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -25,25 +25,24 @@
     <% if @repositories.present? %>
       <table>
         <tbody>
-          <% @repositories.each do |repo| %>
+          <% @repositories.each do |repository| %>
             <tr>
               <td class="px-6 py-4 whitespace-nowrap">
                 <div class="flex justify-between items-center w-full">
                   <div>
                     <span class="align-middle inline">
-                      <%= link_to repo.full_name, "https://github.com/#{repo.full_name}", target: "_blank", rel: "noopener noreferrer", class: "text-blue-600 hover:text-blue-800" %>
+                      <%= link_to repository.full_name, "https://github.com/#{repository.full_name}", target: "_blank", rel: "noopener noreferrer", class: "text-blue-600 hover:text-blue-800" %>
                     </span>
                   </div>
                   <td>
-                    <% campaign = @campaigns_by_repository_id[repo.id] %>
-                    <% if campaign %>
-                      <%= link_to 'Show Campaign', edit_user_repository_campaign_path(current_user, repo, campaign), class: "btn btn-success" %>
+                    <% if repository.campaign %>
+                      <%= link_to 'Show Campaign', user_repository_campaign_path(current_user, repository, repository.campaign), class: "btn btn-success" %> 
                     <% else %>
-                      <%= link_to 'Create Campaign', new_user_repository_campaign_path(current_user, repo), class: "bg-blue-500 text-white px-4 py-2 rounded inline-block" %>
+                      <%= link_to 'Create Campaign', new_user_repository_campaign_path(current_user, repository), class: "bg-blue-500 text-white px-4 py-2 rounded inline-block" %>
                     <% end %>
                   </td>
                   <td class="px-6 py-4 whitespace-nowrap">
-                    <button class="bg-blue-500 text-white px-4 py-2 rounded copy-button" data-copy-text="<%= "https://github.com/#{repo.full_name}" %>">
+                    <button class="bg-blue-500 text-white px-4 py-2 rounded copy-button" data-copy-text="<%= "https://github.com/#{repository.full_name}" %>">
                       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 inline">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M8.25 7.5V6.108c0-1.135.845-2.098 1.976-2.192.373-.03.748-.057 1.123-.08M15.75 18H18a2.25 2.25 0 0 0 2.25-2.25V6.108c0-1.135-.845-2.098-1.976-2.192a48.424 48.424 0 0 0-1.123-.08M15.75 18.75v-1.875a3.375 3.375 0 0 0-3.375-3.375h-1.5a1.125 1.125 0 0 1-1.125-1.125v-1.5A3.375 3.375 0 0 0 6.375 7.5H5.25m11.9-3.664A2.251 2.251 0 0 0 15 2.25h-1.5a2.251 2.251 0 0 0-2.15 1.586m5.8 0c.065.21.1.433.1.664v.75h-6V4.5c0-.231.035-.454.1-.664M6.75 7.5H4.875c-.621 0-1.125.504-1.125 1.125v12c0 .621.504 1.125 1.125 1.125h9.75c.621 0 1.125-.504 1.125-1.125V16.5a9 9 0 0 0-9-9Z" />
                       </svg>
diff --git a/config/routes.rb b/config/routes.rb
index 5d0b35a..8d1d3d6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,23 +2,18 @@
 
 Rails.application.routes.draw do
   devise_for :users, controllers: {
-    registrations: 'users/registrations',
     omniauth_callbacks: 'users/callbacks'
   }
 
-  devise_scope :user do
-    get 'login', to: 'devise/sessions#new'
-    get 'signup', to: 'devise/registrations#new'
-  end
-
   root to: 'home#index'
 
   resources :users, only: [] do
     resource :wallet, only: %i[show create destroy]
     resources :repositories, only: [] do
-      resources :campaigns
+      resources :campaigns, only: %i[show new create edit update destroy] do
+        resources :contributions, only: %i[new create]
+      end
     end
   end
-  # resources :campaigns, only: [:index]
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
 end
diff --git a/spec/controllers/users/callbacks_controller_spec.rb b/spec/controllers/users/callbacks_controller_spec.rb
index 1543b1b..e619b1a 100644
--- a/spec/controllers/users/callbacks_controller_spec.rb
+++ b/spec/controllers/users/callbacks_controller_spec.rb
@@ -8,6 +8,8 @@
   Sidekiq::Testing.fake!
 
   before do
+    allow(User).to receive(:from_omniauth).and_return(user)
+    @request.env['devise.mapping'] = Devise.mappings[:user]
     request.env['devise.mapping'] = Devise.mappings[:user]
 
     OmniAuth.config.test_mode = true
@@ -58,24 +60,23 @@
   end
 
   describe 'GET #github' do
-    context 'when user does not exist' do
-      it 'creates a user and redirects to the home page' do
-        expect do
-          get :github
-        end.to change(User, :count).by(1)
+    context 'when user from omniauth is not persisted' do
+      let(:user) { build(:user) }
 
-        expect(response).to redirect_to(root_path)
-        expect(controller.current_user).to eq(User.last)
+      it 'redirects to the home page' do
+        get :github
+
+        expect(response).to redirect_to(new_user_session_path)
       end
     end
 
+    # context 'when user from omniauth is persisted' do
+    #   let(:user) { create(:user) }
     context 'when user already exists' do
       let!(:user) { create(:user, uid: '123456', provider: 'github', email: 'test@example.com', nickname: 'testuser') }
 
       it 'signs in the user and redirects to the home page' do
-        expect do
-          get :github
-        end.not_to change(User, :count)
+        get :github
 
         expect(response).to redirect_to(root_path)
         expect(controller.current_user).to eq(user)
diff --git a/spec/requests/campaigns_spec.rb b/spec/requests/campaigns_spec.rb
index 97e180d..b3b682c 100644
--- a/spec/requests/campaigns_spec.rb
+++ b/spec/requests/campaigns_spec.rb
@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe 'Campaigns', type: :request do
-  let(:user) { create(:user, uid: '12345', provider: 'github', github_access_token: 'mock_token') }
-  let(:another_user) { create(:user, uid: '6789', provider: 'github', github_access_token: 'mock_token') }
+  let(:user) { create(:user, uid: '12345', provider: 'github', github_access_token: 'mock_token', avatar_url: 'https://avatars.githubusercontent.com/u/12345?v=4' ) }
+  let(:another_user) { create(:user, uid: '6789', provider: 'github', github_access_token: 'mock_token', avatar_url: 'https://avatars.githubusercontent.com/u/12345?v=4') }
   let(:repository) { create(:repository, user:) }
   let(:another_repository) { create(:repository, user: another_user) }
-  let(:another_repository_campaign) { create(:campaign, repository: another_repository, title: 'another repository campaign name', description: 'This is a great campaign') }
   let(:wallet) { create(:wallet, user:) }
-  # let(:another_wallet) { create(:wallet, user: another_user) }
+  let(:another_repository_campaign) do
+    create(:campaign, repository: another_repository, title: 'another repository campaign name', description: 'This is a great campaign')
+  end
+
   let(:valid_attributes) do
     {
       receiving_wallet_id: wallet.id,
@@ -19,7 +23,7 @@
   end
 
   before do
-    allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
+    sign_in user
 
     stub_request(:get, "https://api.github.com/repos/#{user.name}/#{repository.name}")
       .to_return(status: 200, body: {
@@ -28,6 +32,7 @@
         "full_name": "#{user.name}/example-repo",
         "owner": {
           "login": user.name,
+          "avatar_url": "https://avatars.githubusercontent.com/u/#{user.id}?=4",
           "id": user.id
         }
       }.to_json, headers: {})
@@ -56,8 +61,13 @@
     context 'when the user does not own the repository' do
       it 'cannot create a new campaign' do
         expect do
-          post user_repository_campaigns_path(user_id: another_user.id, repository_id: another_repository.id), params: { campaign: valid_attributes }
+          post user_repository_campaigns_path(user_id: another_user.id, repository_id: another_repository.id),
+               params: { campaign: valid_attributes }
         end.to_not change(Campaign, :count)
+
+        expect(response).to redirect_to(root_path)
+        follow_redirect!
+        expect(flash[:alert]).to include('Repository not found or does not belong to you.')
       end
     end
   end
@@ -70,16 +80,16 @@
   end
 
   describe 'GET /show' do
-    context 'when the user is not creator of campaign and is logged-in' do
-      it 'allows user to see campaign' do
+    context 'when the user is not the creator of the campaign but is logged in' do
+      it 'allows the user to see the campaign' do
         get user_repository_campaign_path(user_id: another_user.id, repository_id: another_repository.id, id: another_repository_campaign.id)
         expect(response).to be_successful
         expect(response.body).to include('another repository campaign name')
       end
     end
 
-    context 'when the user is not creator of campaign and is not logged-in' do
-      it 'allows user to see campaign' do
+    context 'when the user is not logged in' do
+      it 'still allows the user to see the campaign' do
         allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(nil)
 
         get user_repository_campaign_path(user_id: another_user.id, repository_id: another_repository.id, id: another_repository_campaign.id)
@@ -88,4 +98,4 @@
       end
     end
   end
-end
+end
\ No newline at end of file