diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fa30d85..cdab582 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -82,17 +82,25 @@ def new
 
     @lecturer_options = Enrolment.where(course: @course, role: :lecturer).includes(:user)
 
-    @field_values = {}
-
-    # Optionally preselect topic or own proposal
-    topic_id = params[:topic_id].presence || params[:based_on_topic]
+    # Choose Supervisor
+    @lecturers = @course.lecturers
+    @lecturer_capacity_info = {}
+    @lecturers.each do |lecturer|
+      @lecturer_capacity_info[lecturer.id] = @course.lecturer_capacity(lecturer)
+    end
 
-    return unless topic_id.present?
+    @field_values = {}
 
-    if topic_id.to_s.start_with?('own_proposal_')
-      @selected_topic_id = topic_id
-    elsif @course.topics.exists?(id: topic_id)
-      @selected_topic_id = topic_id
+    if params[:topic_id].present?
+      @selected_topic = @course.topics.find_by(id: params[:topic_id])
+      if @selected_topic
+        latest_instance = @selected_topic.current_instance
+          @field_values = latest_instance.project_instance_fields.each_with_object({}) do |f, h|
+            h[f.project_template_field_id.to_i] = f.value
+          end
+      end
+    elsif params[:lecturer_id].present?
+      @selected_lecturer = @course.lecturers.find_by(id: params[:lecturer_id])
     end
   end
 
@@ -135,29 +143,20 @@ def create
           raise StandardError, 'You already have a project' if has_project
         end
 
-        raise StandardError, 'Please choose a lecturer and topic' if params[:based_on_topic].blank?
-
-        if params[:based_on_topic].start_with?('own_proposal_')
-          # Extract lecturer ID from value
-          lecturer_id = params[:based_on_topic].split('_').last.to_i
-
-          # Find lecturer enrolment for course
-          supervisor_enrolment = Enrolment.find_by(user_id: lecturer_id, course_id: @course.id, role: :lecturer)
-
-          raise StandardError unless supervisor_enrolment
-        else
-          # Treat as topic_id
-          topic = Topic.find_by(id: params[:based_on_topic], course: @course)
+        topic = Topic.find_by(id: params[:based_on_topic], course: @course) if params[:based_on_topic].present?
+        lecturer_id = params[:lecturer_id].presence
 
-          raise StandardError unless topic
+        raise StandardError, 'Please choose a lecturer or topic' if topic.nil? && lecturer_id.nil?
 
-          # Set supervisor enrolment to the owner of the topic (assuming you want this)
-          topic_owner = topic&.owner
-          raise StandardError unless topic_owner.is_a?(User)
+        if topic
+          topic_owner = topic.owner
+          raise StandardError, 'Topic has no valid owner' unless topic_owner.is_a?(User)
 
           supervisor_enrolment = Enrolment.find_by(user_id: topic_owner.id, course_id: @course.id, role: :lecturer)
-
-          raise StandardError unless supervisor_enrolment
+          raise StandardError, 'Could not find supervisor enrolment' unless supervisor_enrolment
+        else
+          supervisor_enrolment = Enrolment.find_by(user_id: lecturer_id, course_id: @course.id, role: :lecturer)
+          raise StandardError, 'Could not find supervisor enrolment' unless supervisor_enrolment
         end
 
         @project = Project.create!(
@@ -256,34 +255,25 @@ def update
           end
         end
 
-        @instance.title = params[:fields].values.first if !is_approved && params[:fields].present? && @instance.title.blank?
-
-        @instance.last_edit_time = Time.current
-        @instance.last_edit_by = current_user.id
-        @instance.save!
+        topic = Topic.find_by(id: params[:based_on_topic], course: @course) if params[:based_on_topic].present?
+        lecturer_id = params[:lecturer_id].presence
 
-        unless is_approved
-          raise StandardError, 'Please choose a lecturer and topic' if params[:based_on_topic].blank?
-
-          if params[:based_on_topic].start_with?('own_proposal_')
-            lecturer_id = params[:based_on_topic].split('_').last.to_i
-            supervisor_enrolment = Enrolment.find_by(id: lecturer_id, course_id: @course.id, role: :lecturer)
-            raise StandardError, 'Lecturer not found' unless supervisor_enrolment
-
-            @instance.update!(source_topic_id: nil)
-          else
-            topic = Topic.find_by(id: params[:based_on_topic], course: @course)
-            raise StandardError, 'Topic not found' unless topic && topic.owner.is_a?(User)
+        raise StandardError, 'Please choose a lecturer or topic' if topic.nil? && lecturer_id.nil?
 
-            supervisor_enrolment = Enrolment.find_by(user_id: topic.owner.id, course_id: @course.id, role: :lecturer)
-            raise StandardError, 'Supervisor enrolment missing' unless supervisor_enrolment
-
-            @instance.update!(source_topic: topic)
-          end
+        if topic
+          raise StandardError, 'Topic has no valid owner' unless topic.owner.is_a?(User)
+          supervisor_enrolment = Enrolment.find_by(user_id: topic.owner.id, course_id: @course.id, role: :lecturer)
+          
+          raise StandardError, 'Could not find supervisor enrolment' unless supervisor_enrolment
+          @instance.update!(source_topic: topic)
+        else
+          supervisor_enrolment = Enrolment.find_by(user_id: lecturer_id, course_id: @course.id, role: :lecturer)
+          raise StandardError, 'Could not find supervisor enrolment' unless supervisor_enrolment
+          @instance.update!(source_topic_id: nil)
+        end
 
           @project.update!(enrolment: supervisor_enrolment)
         end
-      end
     rescue StandardError => e
       redirect_to course_project_path(@course, @project), alert: "Project update failed: #{e.message}"
       return
diff --git a/app/javascript/application.js b/app/javascript/application.js
index 7d1db6d..0d80407 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -7,3 +7,7 @@ import "htmx.org";
 document.addEventListener("turbo:load", function () {
   window.htmx.process(document.body);
 });
+
+Turbo.config.drive.confirmationMethod = (message, element, submitter) => {
+  return Promise.resolve(window.confirm(message));
+};
\ No newline at end of file
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
index fccc1dc..ddb5d1a 100644
--- a/app/javascript/controllers/index.js
+++ b/app/javascript/controllers/index.js
@@ -1,4 +1,4 @@
 // Import and register all your controllers from the importmap via controllers/**/*_controller
 import { application } from "controllers/application";
 import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading";
-eagerLoadControllersFrom("controllers", application);
+eagerLoadControllersFrom("controllers", application);
\ No newline at end of file
diff --git a/app/javascript/controllers/proposal_selection_controller.js b/app/javascript/controllers/proposal_selection_controller.js
new file mode 100644
index 0000000..93dab54
--- /dev/null
+++ b/app/javascript/controllers/proposal_selection_controller.js
@@ -0,0 +1,80 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["lecturerPanel", "topicPanel", "hiddenLecturerId", "hiddenTopicId"]
+
+  connect() {
+    // Restore initial state from server-rendered hidden fields on page load
+    const lecturerId = this.hiddenLecturerIdTarget.value
+    const topicId = this.hiddenTopicIdTarget.value
+
+    if (lecturerId) {
+      this.#disablePanel(this.topicPanelTarget)
+    } else if (topicId) {
+      this.#disablePanel(this.lecturerPanelTarget)
+    }
+  }
+
+  selectLecturer(event) {
+    const button = event.currentTarget
+    const lecturerId = button.dataset.lecturerId
+    const isAlreadySelected = this.hiddenLecturerIdTarget.value === lecturerId
+
+    if (isAlreadySelected) {
+      // Deselect
+      this.hiddenLecturerIdTarget.value = ""
+      this.#markSelected(button, false)
+      this.#enablePanel(this.topicPanelTarget)
+    } else {
+      // Warn if topic is already selected
+      if (this.hiddenTopicIdTarget.value) {
+        if (!confirm("You'll lose your selected topic. Continue?")) return
+        this.hiddenTopicIdTarget.value = ""
+      }
+
+      this.hiddenLecturerIdTarget.value = lecturerId
+      this.#clearAllLecturerSelections()
+      this.#markSelected(button, true)
+      this.#disablePanel(this.topicPanelTarget)
+      this.#enablePanel(this.lecturerPanelTarget)
+    }
+  }
+
+  // Called by the "Clear" link next to the lecturer heading
+  clearLecturer(event) {
+    event.preventDefault()
+    this.hiddenLecturerIdTarget.value = ""
+    this.#clearAllLecturerSelections()
+    this.#enablePanel(this.topicPanelTarget)
+  }
+
+  // Private 
+
+  #clearAllLecturerSelections() {
+    this.lecturerPanelTarget
+      .querySelectorAll("button[data-lecturer-id]")
+      .forEach(btn => this.#markSelected(btn, false))
+  }
+
+  #markSelected(button, selected) {
+    const check = button.querySelector("[data-selected-check]")
+
+    if (selected) {
+      button.classList.add("border-blue-400", "ring-2", "ring-blue-100")
+      button.classList.remove("border-gray-200", "hover:border-gray-400")
+      if (check) check.classList.remove("hidden")
+    } else {
+      button.classList.remove("border-blue-400", "ring-2", "ring-blue-100")
+      button.classList.add("border-gray-200", "hover:border-gray-400")
+      if (check) check.classList.add("hidden")
+    }
+  }
+
+  #disablePanel(panel) {
+    panel.classList.add("opacity-50", "pointer-events-none")
+  }
+
+  #enablePanel(panel) {
+    panel.classList.remove("opacity-50", "pointer-events-none")
+  }
+}
\ No newline at end of file
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index bad27ba..619ba87 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -49,7 +49,7 @@ def show?
   end
 
   def create?
-    student || coordinator
+    student && !has_existing_project?
   end
 
   def update?
@@ -110,4 +110,8 @@ def any_free_edit_fields?
           &.project_template_fields
           &.exists?(free_edit: true) || false
   end
+
+  def has_existing_project?
+    course.projects.owned_by_user(user).exists?
+  end
 end
diff --git a/app/views/courses/_topic_card.html.erb b/app/views/courses/_topic_card.html.erb
index 97b79a6..94fb809 100644
--- a/app/views/courses/_topic_card.html.erb
+++ b/app/views/courses/_topic_card.html.erb
@@ -21,7 +21,7 @@
     if local_assigns[:lecturer].present?
       course_lecturer_topic_path(course, lecturer, topic)
     else
-      course_topic_path(@course, topic)
+      course_topic_path(@course, topic, from_new_project: params[:from_new_project])
     end
 
   card_classes =
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 384649f..e9c0d20 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -63,87 +63,197 @@
       "
     >
       <div class="p-5 sm:p-8 md:p-10">
-        <%= form_with url: course_projects_path(@course), method: :post, class: "space-y-8" do |form| %>
+        <%= form_with url: course_projects_path(@course), method: :post, class: "space-y-8",
+            data: { controller: "proposal-selection" } do |form| %>
+
+          <%= form.hidden_field :lecturer_id,
+              value: @selected_lecturer&.id,
+              id: "hidden_lecturer_id",
+              data: { proposal_selection_target: "hiddenLecturerId" } %>
+
+          <%= form.hidden_field :based_on_topic,
+              value: @selected_topic&.id,
+              id: "hidden_topic_id",
+              data: { proposal_selection_target: "hiddenTopicId" } %>
 
           <%# Reusable input class definition %>
           <% input_classes =
             "w-full px-4 py-3 border border-gray-200 rounded-lg sm:rounded-xl text-gray-700 bg-gray-50 focus:outline-none focus:ring-4 focus:ring-blue-500/10 focus:border-blue-500 transition-all font-medium placeholder-gray-400 text-sm sm:text-base" %>
 
-          <div class="flex flex-col group">
-            <label
-              class="
-                block text-xs sm:text-sm font-bold text-gray-700 uppercase tracking-wide mb-2
-              "
-            >
-              Based on Topic
-            </label>
+          <%# Based on topic or lecturer%>
+          <div class="border border-gray-200 rounded-2xl bg-white p-6 space-y-6">
 
-            <div class="relative">
-            <% red_warning = "text-[11px] sm:text-xs font-bold text-red-600 tracking-normal mb-2" %>
-            <% grey_warning = "text-[11px] sm:text-xs text-gray-700 tracking-normal mb-2" %>
-            <p>
-              <span class="<%= red_warning %>"> Warning:</span>
-              <span class="<%= grey_warning %>">Switching to a lecturer's topic will autofill that topic's details. (You will lose any existing details in the fields!)</span>
+            <label class="block text-xs sm:text-sm font-bold text-gray-700 uppercase tracking-wide mb-3">
+              Start your proposal
+            </label>
+            <p class="text-xs text-gray-500 mb-3">
+              Choose <span class="font-semibold">one</span> option below to start your proposal.
             </p>
-              <select
-                name="based_on_topic"
-                class="
-                  <%= input_classes %> appearance-none pr-10 cursor-pointer
-                "
-                required
-                hx-get="<%= selected_topic_course_projects_path(@course) %>"
-                hx-trigger="change, load"
-                hx-target="#template-fields-container"
-                hx-swap="outerHTML"
-                >
-
-                <% if @selected_topic_id.nil? %>
-                  <option value="" selected disabled>-- Select a Topic --</option>
+
+            <%# Based on lecturer %>
+            <div id="lecturer-panel" 
+                 data-proposal-selection-target="lecturerPanel"
+                 class="border border-gray-200 rounded-xl bg-gray-50 p-5">
+                 
+              <div class="flex items-center justify-between gap-3 mb-4">
+
+                <div class="flex items-center gap-3">
+                  <div class="w-9 h-9 bg-white border border-gray-200 rounded-lg flex items-center justify-center shrink-0 shadow-sm">
+                    <svg class="w-4 h-4 text-gray-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
+                    </svg>
+                  </div>
+                  <div>
+                    <p class="text-sm font-bold text-gray-800">Choose a Lecturer</p>
+                    <p class="text-xs text-gray-500">Submit your proposal directly to a lecturer.</p>
+                  </div>
+                </div>
+
+                <% if @selected_lecturer %>
+                  <button
+                    type="button"
+                    data-action="proposal-selection#clearLecturer"
+                    class="shrink-0 text-xs text-gray-500 hover:text-red-600 hover:underline transition-colors"
+                  >
+                    Clear
+                  </button>
                 <% end %>
-                <% @lecturer_options.each do |lecturer_enrolment| %>
-                  <% lecturer = lecturer_enrolment.user %>
-                  <optgroup label="<%= lecturer.name %>" class="font-bold text-gray-900">
-                    <% approved_topics =
-                      Topic.where(
-                        status: :approved,
-                        course: @course,
-                        owner_type: "User",
-                        owner_id: lecturer.id,
-                      ) %>
-
-                    <% approved_topics.each do |topic| %>
-                      <% current_instance = topic.topic_instances.order(version: :desc).first %>
-                      <option
-                        value="<%= topic.id %>"
-                        <%= 'selected' if topic.id.to_s == @selected_topic_id.to_s %>
+              </div>
+
+              <ul class="grid grid-cols-1 sm:grid-cols-2 gap-2 list-none p-0 m-0">
+                <% @lecturers.each do |lecturer| %>
+                  <% capacity_info = @lecturer_capacity_info[lecturer.id] %>
+                  <% is_full = capacity_info[:is_at_capacity] %>
+                  <% is_selected = @selected_lecturer&.id == lecturer.id %>
+                  <li>
+                    <% if is_full %>
+                      <div class="flex items-center gap-3 p-3 bg-white border border-gray-200 rounded-lg opacity-50 cursor-not-allowed">
+                        <div class="w-9 h-9 bg-[#d9d9d9] rounded-full shrink-0 flex items-center justify-center text-sm font-medium text-gray-700">
+                          <%= lecturer.name.first.upcase %>
+                        </div>
+                        <div class="flex-1 min-w-0">
+                          <p class="text-sm font-semibold text-gray-800 truncate"><%= lecturer.name %></p>
+                          <p class="text-xs text-gray-500">
+                            <%= capacity_info[:approved_proposals] %>/<%= capacity_info[:max_capacity] %> approved
+                            <span class="text-red-500 font-medium ml-1">· full</span>
+                          </p>
+                        </div>
+                      </div>
+                    <% else %>
+                      <button
+                        type="button"
+                        class="w-full text-left flex items-center gap-3 p-3 bg-white border rounded-lg transition-colors <%= is_selected ? 'border-blue-400 ring-2 ring-blue-100' : 'border-gray-200 hover:border-gray-400' %>"
+                        data-lecturer-id="<%= lecturer.id %>"
+                        data-action="proposal-selection#selectLecturer"
+                        data-selected="<%= is_selected %>"
                       >
-                        <%= "#{lecturer.name} - #{current_instance&.title || "Untitled Topic"}" %>
-                      </option>
+                        <div class="w-9 h-9 bg-[#d9d9d9] rounded-full shrink-0 flex items-center justify-center text-sm font-medium text-gray-700">
+                          <%= lecturer.name.first.upcase %>
+                        </div>
+                        <div class="flex-1 min-w-0">
+                          <p class="text-sm font-semibold text-gray-800 truncate"><%= lecturer.name %></p>
+                          <p class="text-xs text-gray-500">
+                            <%= capacity_info[:approved_proposals] %>/<%= capacity_info[:max_capacity] %> approved
+                            <% if capacity_info[:pending_proposals] > 0 %>
+                              <span class="text-amber-600 ml-1">· <%= capacity_info[:pending_proposals] %> pending</span>
+                            <% end %>
+                          </p>
+                        </div>
+                        <svg
+                          class="w-4 h-4 text-blue-500 shrink-0 <%= is_selected ? '' : 'hidden' %>"
+                          data-selected-check
+                          fill="none"
+                          stroke="currentColor"
+                          viewBox="0 0 24 24"
+                        >
+                          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
+                        </svg>
+                      </button>
                     <% end %>
+                  </li>
+                <% end %>
+              </ul>
+
+            </div>
+
+            <%# OR divider %>
+            <div class="flex items-center justify-center my-4">
+              <div class="w-8 h-8 rounded-full bg-gray-100 border border-gray-200 flex items-center justify-center">
+                <span class="text-xs font-medium text-gray-400">or</span>
+              </div>
+            </div>
+
+            <%# --- Based on topic --- %>
+            <div id="topic-panel"
+                 data-proposal-selection-target="topicPanel"
+                 class="border border-gray-200 rounded-xl bg-gray-50 p-5 space-y-4">
+                 
+              <div class="border border-gray-200 rounded-xl bg-gray-50 p-5 space-y-4">
+                <div class="flex items-start justify-between gap-4">
+                  <div class="flex items-start gap-3 min-w-0">
+                    <div class="w-9 h-9 bg-white border border-gray-200 rounded-lg flex items-center justify-center shrink-0 shadow-sm">
+                      <svg class="w-4 h-4 text-gray-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
+                      </svg>
+                    </div>
+
+                    <div class="min-w-0">
+                      <p class="text-sm font-bold text-gray-800">Topic</p>
+
+                      <% if @selected_topic %>
+                        <p class="text-xs text-gray-500">
+                          This topic and its details have been pre-filled below.
+                        </p>
+                      <% else %>
+                        <p class="text-xs text-gray-500">
+                          <span class="font-bold text-red-600">Warning:</span>
+                          Selecting a topic will overwrite any details already filled in.
+                        </p>
+                      <% end %>
+                    </div>
+                  </div>
+
+                  <% if @selected_topic %>
+                    <div class="flex items-center gap-2">
+                      <%= link_to new_course_project_path(@course),
+                          class: "inline-flex shrink-0 items-center gap-1.5 px-4 py-2 text-xs font-semibold text-red-600 bg-white border border-red-200 rounded-lg hover:bg-red-50 hover:border-red-300 transition-colors shadow-sm" do %>
+                        Unselect topic
+                        <svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                        </svg>
+                      <% end %>
+                      
+                      <%= link_to course_topics_path(@course, from_new_project: true),
+                          onclick: "return confirm('You\\'ll lose your current form data. Continue?');",
+                          class: "inline-flex shrink-0 items-center gap-1.5 px-4 py-2 text-xs font-semibold text-gray-700 bg-white border border-gray-200 rounded-lg hover:bg-gray-100 transition-colors shadow-sm" do %>
+                        Change topic
+                        <svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                        </svg>
+                      <% end %>
+
+                    </div>
+                  <% else %>
+                    <%= link_to course_topics_path(@course, from_new_project: true),
+                        class: "inline-flex shrink-0 items-center gap-1.5 px-4 py-2 text-xs font-semibold text-gray-700 bg-white border border-gray-200 rounded-lg hover:bg-gray-100 transition-colors shadow-sm" do %>
+                      View all topics
+                      <svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                      </svg>
+                    <% end %>
+                  <% end %>
+                </div>
+
+                <%# Selected topic card %>
+                <% if @selected_topic %>
+                    <div class="grid grid-cols-1 sm:grid-cols-[repeat(auto-fill,minmax(350px,1fr))] gap-6 w-full">
+                      <%= render "courses/topic_card", topic: @selected_topic %>
+                    </div>
 
-                    <option
-                      value="own_proposal_<%= lecturer.id %>"
-                      class="text-blue-600 font-medium"
-                      <%= 'selected' if @selected_topic_id.to_s == "own_proposal_#{lecturer.id}" %>>
-                      <%= "#{lecturer.name} - Own Proposal" %>
-                    </option>
-                  </optgroup>
                 <% end %>
-              </select>
-              <div
-                class="
-                  absolute inset-y-0 right-0 flex items-center px-4 pointer-events-none
-                  text-gray-500
-                "
-              >
-                <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    d="M19 9l-7 7-7-7"
-                  /></svg>
               </div>
             </div>
+
           </div>
 
           <%= render 'project_new',
diff --git a/app/views/topics/_topic_actions.html.erb b/app/views/topics/_topic_actions.html.erb
index f0c37b3..ee63405 100644
--- a/app/views/topics/_topic_actions.html.erb
+++ b/app/views/topics/_topic_actions.html.erb
@@ -74,5 +74,22 @@ has_actions = is_member || is_history %>
       <% end %>
     <% end %>
 
-  </div>
+    <%# --- PROPOSE BASED ON TOPIC ACTION --- %>
+    <% if policy(Project.new(course: @course)).create? %>
+      <%= link_to new_course_project_path(@course, topic_id: @topic.id, from_topics: true),
+          class: "flex items-center justify-center w-full gap-2 bg-white border-2 border-blue-100 text-blue-600 hover:bg-blue-50 hover:border-blue-200 font-bold py-2.5 px-4 rounded-xl transition-colors group" do %>
+        <div
+          class="
+            w-5 h-5 rounded-full bg-blue-100 flex items-center justify-center
+            group-hover:bg-white transition-colors
+          "
+        >
+          <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"/>
+          </svg>
+        </div>
+        <span class="text-sm">Propose Based on This Topic</span>
+      <% end %>
+    <% end %>
+
 </section>
diff --git a/app/views/topics/_topic_fields.html.erb b/app/views/topics/_topic_fields.html.erb
index 6950aaa..7b5605e 100644
--- a/app/views/topics/_topic_fields.html.erb
+++ b/app/views/topics/_topic_fields.html.erb
@@ -84,16 +84,11 @@
 
         </div>
       <% end %>
-      <% if is_student %>
-        <%= link_to "Propose Based on this Topic",
-        new_course_project_path(course, topic_id: topic.id),
-        class:
-          "inline-flex items-center justify-center px-6 py-3 text-base font-semibold text-white transition-all duration-200 bg-blue-600 rounded-lg hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 hover:shadow-md" %>
-      <% end %>
+
     </div>
   </div>
 
-  <%# ---DIFF TOOL--- %>
+  <%# DIFF TOOL %>
   <% if index < instances.size %>
 
     <div
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 96fe015..01adab8 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -81,7 +81,8 @@
           <div class="flex flex-col md:flex-row xl:flex-col gap-6">
 
             <% has_actions =
-              @members.include?(current_user) || @current_version != @latest_version %>
+              @members.include?(current_user) || @current_version != @latest_version || 
+              policy(Project.new(course: @course)).create? %>
 
             <% if has_actions %>
               <section
diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index 631a3b9..f7d6d42 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -59,14 +59,24 @@
 
 crumb :topics do |course|
   link 'Topics', course_topics_path(course)
-  parent :course, course
+  if params[:from_new_project]
+    parent :new_project, course
+  else
+    parent :course, course
+  end
 end
 
 crumb :topic do |topic|
   link topic.topic_instances.last&.title
-  parent :topics, topic.course
+  if params[:lecturer_id]
+    lecturer = User.find(params[:lecturer_id])
+    parent :lecturer, topic.course, lecturer
+  elsif params[:from_new_project]
+    parent :topics, topic.course
+  else
+    parent :topics, topic.course
+  end
 end
-
 crumb :new_topic do |course|
   link 'New Topic', new_course_topic_path(course)
   parent :topics, course
diff --git a/db/seeds.rb b/db/seeds.rb
index e4d8d0e..79ec21d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -473,12 +473,6 @@
 )
 
 # Create Project Template Fields
-title_field_individual = ProjectTemplateField.create!(
-  project_template: individual_template,
-  field_type: :shorttext,
-  applicable_to: :both,
-  label: 'Project Title'
-)
 
 project_description_field = ProjectTemplateField.create!(
   project_template: individual_template,
@@ -496,13 +490,6 @@
   hint: 'Provide feedback on the proposal'
 )
 
-title_field_group = ProjectTemplateField.create!(
-  project_template: group_template,
-  field_type: :shorttext,
-  applicable_to: :both,
-  label: 'Project Title'
-)
-
 group_description_field = ProjectTemplateField.create!(
   project_template: group_template,
   field_type: 1, # textarea
@@ -511,6 +498,10 @@
   hint: 'Describe the group project scope and member responsibilities'
 )
 
+# Title fields are auto created via validation callback
+title_field_individual = individual_template.project_template_fields.find_by(label: 'Project Title')
+title_field_group = group_template.project_template_fields.find_by(label: 'Project Title')
+
 # Create Projects
 lecturer_1_topic_1 = Topic.create!(
   course: course_with_groups,
@@ -1014,145 +1005,147 @@
   value: 'Praesent ultrices ipsum nec ante lobortis feugiat. Vivamus auctor ex eget lobortis cursus'
 )
 
-ProjectInstanceField.create!(instance: lecturer_1_topic_1_instance_1,
-                             project_template_field: title_field_individual,
-                             value: 'Difficult Topic 1')
+ProjectInstanceField.create!(
+  instance: lecturer_1_topic_1_instance_1,
+  project_template_field: title_field_group,
+  value: 'Difficult Topic 1'
+)
 
 ProjectInstanceField.create!(
   instance: lecturer_1_topic_1_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Sed ut vulputate neque'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_1_topic_2_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 2'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_1_topic_2_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Donec luctus sem tellus, ac sagittis urna suscipit non.'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_1_topic_3_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 3'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_1_topic_3_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Etiam mollis risus nec dolor faucibus, lacinia consectetur quam semper'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_1_topic_4_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 4'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_1_topic_4_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Duis quis sagittis libero'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_2_topic_1_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 1 Lecturer 2'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_2_topic_1_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Etiam eleifend sodales tincidunt'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_2_topic_2_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 2 Lecturer 2'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_2_topic_2_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'In in auctor ante.'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_2_topic_3_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 3 Lecturer 2'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_2_topic_3_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Donec mattis sed ex eget aliquet'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_2_topic_4_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 4 Lecturer 2'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_2_topic_4_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Vivamus tempor lacus consectetur magna laoreet dictum'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_3_topic_1_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 1 Lecturer 3'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_3_topic_1_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Aenean accumsan vehicula ex eget aliquam.'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_3_topic_2_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 2 Lecturer 3'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_3_topic_2_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Ut tincidunt cursus nisi eget semper'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_3_topic_3_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 3 Lecturer 3'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_3_topic_3_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Nullam vitae ornare ex'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_3_topic_4_instance_1,
-  project_template_field: title_field_individual,
+  project_template_field: title_field_group,
   value: 'Difficult Topic 4 Lecturer 3'
 )
 
 ProjectInstanceField.create!(
   instance: lecturer_3_topic_4_instance_1,
-  project_template_field: project_description_field,
+  project_template_field: group_description_field,
   value: 'Quisque efficitur magna nec eros luctus, at vestibulum ipsum rutrum.'
 )
 
@@ -1295,7 +1288,7 @@
 )
 
 ProjectInstanceField.create!(
-  instance: lecturer_3_topic_1_instance_1,
+  instance: lecturer_3_topic_1_no_groups_instance_1,
   project_template_field: lecturer_feedback_field,
   value: 'Donec a cursus purus'
 )