diff --git a/app.py b/app.py
index 0b5923d..aed3b8d 100644
--- a/app.py
+++ b/app.py
@@ -1,6 +1,8 @@
 import datetime
 
 import jinja2.defaults
+from sqlalchemy import and_
+from sqlalchemy.orm import joinedload
 
 from auth import auth_bp
 from user import user_bp
@@ -8,7 +10,7 @@
 from config import config_bp
 from course_preference import course_preference_bp
 from assignment import assignment_bp
-from db import db, Year, Organization, User, Course, Teacher, Researcher, Evaluation
+from db import db, Year, Organization, User, Course, Teacher, Researcher, Evaluation, AssignmentPublished
 from decorators import *
 from flask import Flask, render_template, session, request
 from enums import *
@@ -53,11 +55,51 @@ def inject_configurations():
 # Routes
 @app.route('/')
 @login_required
-def index():  # put application's code here
+def index():
     current_year = get_current_year()
+    year = db.session.query(Year).filter_by(year=current_year).first()
     user = db.session.query(User).filter_by(email=session['email']).first()
-    courses_teacher = db.session.query(Course).filter_by(year=current_year).join(Teacher).filter(Teacher.user_id == user.id).all()
-    return render_template("home.html", user=user, courses=courses_teacher, evaluations=user.evaluations)
+    teacher = db.session.query(Teacher).filter_by(user_id=user.id).first() if user.is_teacher else None
+
+    data = {}
+
+    if user.is_teacher:
+        # Populate teacher-specific data
+        teacher_courses = db.session.query(Course).join(Teacher).filter(
+            and_(Teacher.user_id == user.id, Course.year == current_year)
+        ).all()
+
+        supervised_researchers = []
+        for researcher_supervisor in teacher.user.researchers:
+            researcher = researcher_supervisor.researcher
+            current_year_courses = [
+                course for course in researcher.assigned_courses if course.year == current_year
+            ]
+            researcher.current_assigned_courses = current_year_courses
+            supervised_researchers.append(researcher)
+
+        data.update({
+            "teacher_courses": teacher_courses,
+            "supervised_researchers": supervised_researchers
+        })
+
+    # To change if we decide to use session to store roles
+    elif is_researcher():
+        researcher = db.session.query(Researcher).filter_by(user_id=user.id).first()
+        # Populate researcher-specific data
+        researcher_courses = researcher.assigned_courses
+        researcher_current_courses = [
+            course for course in researcher_courses if course.year == current_year
+        ]
+        evaluations = researcher.user.evaluations
+
+        data.update({
+            "researcher_courses": researcher_courses,
+            "researcher_current_courses": researcher_current_courses,
+            "researcher_evaluations": evaluations
+        })
+
+    return render_template("home.html", user=user, data=data)
 
 
 if __name__ == '__main__':
diff --git a/assignment.py b/assignment.py
index 3a0c48b..082e770 100644
--- a/assignment.py
+++ b/assignment.py
@@ -1,6 +1,6 @@
 from decorators import login_required, check_access_level
 from db import db, User, Course, PreferenceAssignment, Teacher, Researcher, Organization, \
-    ResearcherSupervisor, Role, AssignmentDraft, AssignmentPublished
+    ResearcherSupervisor, Role, AssignmentDraft, AssignmentPublished, Year
 from flask import Blueprint, render_template, flash, current_app, url_for, request, make_response, redirect, session, \
     Flask, jsonify
 from util import get_current_year
@@ -79,6 +79,7 @@ def publish_assignments():
 
     current_year = get_current_year()
     is_draft = data.get('isDraft')
+    is_teacher_publication = data.get('isTeacherPublication')
 
     try:
         # Clear existing assignments for the current year
@@ -113,8 +114,7 @@ def publish_assignments():
                         if not is_draft:
                             assignments_to_add.append(AssignmentPublished(
                                 course_id=course_id, course_year=current_year, researcher_id=researcher_id,
-                                load_q1=load_q1, load_q2=load_q2, position=position, comment=comment
-                            ))
+                                load_q1=load_q1, load_q2=load_q2, position=position, comment=comment))
                     except (ValueError, TypeError) as e:
                         course = db.session.query(Course).filter_by(id=course_id, year=current_year).first()
                         return jsonify({
diff --git a/course.py b/course.py
index cac8d77..021a3a3 100644
--- a/course.py
+++ b/course.py
@@ -1,7 +1,7 @@
 from sqlalchemy import func
 
 from decorators import login_required, check_access_level
-from db import db, User, Course, Teacher, Organization, Evaluation, Year, Role
+from db import db, User, Course, Teacher, Organization, Evaluation, Year, Role, Researcher, AssignmentPublished
 from flask import Blueprint, render_template, flash, url_for, request, make_response, redirect, \
     Flask, jsonify, session
 from util import get_current_year
@@ -97,7 +97,8 @@ def add_course():
         is_course = db.session.query(Course).filter(Course.code == code,
                                                     Course.year == year).first()
         if is_course is not None:
-            return make_response("Course already exists", 500)
+            flash("Course already exists", "danger")
+            return redirect(url_for('course.add_course'))
 
         new_course = Course(year=year, code=code, title=title, quadri=quadri, language=language)
         # Fetch organizations and add them to the course
@@ -106,7 +107,7 @@ def add_course():
 
         db.session.add(new_course)
         db.session.commit()
-        return redirect(url_for("course.courses", year=year))
+        return redirect(url_for("course.course_info", course_id=new_course.id, year=year))
     except Exception as e:
         db.session.rollback()
         raise e
@@ -117,7 +118,7 @@ def add_course():
 @check_access_level(Role.ADMIN)
 def courses(year):
     courses = db.session.query(Course).filter_by(year=year).all()
-    return render_template('courses.html', courses=courses, current_year=year)
+    return render_template('courses.html', courses=courses, year=year)
 
 
 @course_bp.route('/search_teachers')
@@ -141,16 +142,23 @@ def search_teachers():
 @check_access_level(Role.ADMIN)
 def course_info(course_id, year):
     course = db.session.query(Course).filter(Course.id == course_id, Course.year == year).first()
+
     if not course:
         return make_response("Course not found", 404)
 
     all_years = db.session.query(Course).filter_by(id=course.id).distinct(Course.year).order_by(
         Course.year.desc()).all()
 
+    query_all_assistants = db.session.query(User, Course.year).join(Researcher).join(
+        AssignmentPublished).join(Course).filter(
+        AssignmentPublished.course_id == course_id
+    ).order_by(Course.year.desc()).all()
+    all_assistants = [{"user": user, "year": year} for user, year in query_all_assistants]
+
     evaluations = db.session.query(Evaluation).filter_by(course_id=course_id).all() or []
 
     return render_template('course_info.html', course=course, all_years=all_years, current_year=year,
-                           evaluations=evaluations)
+                           evaluations=evaluations, all_assistants=all_assistants)
 
 
 @course_bp.route('/update_course_info', methods=['POST'])
@@ -276,7 +284,7 @@ def course_evaluation(evaluation_id):
 
     course = evaluation.course
     user = db.session.query(User).filter_by(id=session['user_id']).first()
-    teachers = course.course_teacher
+    teachers = course.teachers
 
     # Accessible only to the admin, the evaluation creator and the course teachers
     if (not user.is_admin) and (user.id != evaluation.user_id) and (user.id not in [teacher.user_id for teacher in teachers]):
diff --git a/db.py b/db.py
index bdff5ec..b877c16 100644
--- a/db.py
+++ b/db.py
@@ -2,6 +2,7 @@
 
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy import Enum
 import json
 from sqlalchemy.orm import validates
 
@@ -60,6 +61,7 @@ class Course(db.Model):
 
     __table_args__ = (db.UniqueConstraint('id', 'year', name='uq_course_id_year'),)
 
+    teachers = db.relationship('Teacher', backref=db.backref('course_teacher', lazy=True))
     organizations = db.relationship('Organization',
                                     secondary='course_organization',
                                     back_populates='courses',
@@ -67,6 +69,15 @@ class Course(db.Model):
                                                 "CourseOrganization.course_year)",
                                     secondaryjoin="Organization.id == CourseOrganization.organization_id")
 
+    assistants = db.relationship(
+        'User',
+        secondary='assignment_published',
+        primaryjoin="and_(Course.id == AssignmentPublished.course_id, Course.year == AssignmentPublished.course_year)",
+        secondaryjoin="and_(Researcher.id == AssignmentPublished.researcher_id, User.id == Researcher.user_id)",
+        backref='assigned_courses',
+        viewonly=True
+    )
+
 
 class Researcher(db.Model):
     __tablename__ = 'researcher'
@@ -77,6 +88,8 @@ class Researcher(db.Model):
     researcher_type = db.Column(db.String(30))
 
     user = db.relationship('User', backref=db.backref('researcher_profile', uselist=False))
+    assigned_courses = db.relationship('Course', secondary='assignment_published',
+                                       backref=db.backref('courses', lazy=True), order_by='Course.year.desc()')
 
 
 class ResearcherSupervisor(db.Model):
@@ -104,11 +117,11 @@ class Teacher(db.Model):
     )
 
     user = db.relationship('User', backref=db.backref('user_teacher', uselist=False))
-    course = db.relationship('Course', backref=db.backref('course_teacher', lazy=True))
 
 
 class PreferenceAssignment(db.Model):
     __tablename__ = 'preference_assignment'
+    rank = db.Column(db.Integer, nullable=False)
     id = db.Column(db.Integer, primary_key=True)
     rank = db.Column(db.Integer, nullable=False)
     course_id = db.Column(db.Integer, nullable=False)
diff --git a/enums.py b/enums.py
index 9a2d9a1..ecfe366 100644
--- a/enums.py
+++ b/enums.py
@@ -13,4 +13,4 @@
 TASK = ["Exercise sessions", "Project(s)", "Supervisor of monitoring students", "Q&A sessions/restructuring",
         "Corrections/jury/oral", "Creation of new content (new exercises, new project statement, ...)"]
 EVALUATION_HOUR = ["< 2h", "2h - 4h", "4h - 6h", "6h - 8h", "> 8h"]
-WORKLOAD = ["Very light", "Light", "Reasonable", "High", "Very high"]
+WORKLOAD = ["Very light", "Light", "Reasonable", "High", "Very high"]
\ No newline at end of file
diff --git a/static/scripts/assignment_table.js b/static/scripts/assignment_table.js
index f89fdc5..90dc8e9 100644
--- a/static/scripts/assignment_table.js
+++ b/static/scripts/assignment_table.js
@@ -168,7 +168,6 @@ fetch('/assignment/load_data')
         const columns = getCourseColumns();
 
         let data = fixedRows.concat(userRows);
-
         const nbrLines = data.length - 1;
         const nbrCols = columns.length - 1;
 
@@ -203,7 +202,23 @@ fetch('/assignment/load_data')
             contextMenu: ['commentsAddEdit', 'commentsRemove', 'hidden_columns_hide', 'hidden_rows_hide', 'hidden_columns_show', 'hidden_rows_show'],
             comments: true,
             filters: true,
-            dropdownMenu: ['filter_by_value', 'filter_action_bar', 'undo'],
+            dropdownMenu: {
+                items: {
+                    'filter_by_value': {},
+                    'filter_action_bar': {},
+                    '---------': {},
+                    'clear_all_filters': {
+                        name: 'Reset filters',
+                        callback: function () {
+                            const filtersPlugin = this.getPlugin('filters');
+                            if (filtersPlugin) {
+                                filtersPlugin.clearConditions();
+                                filtersPlugin.filter();
+                            }
+                        },
+                    },
+                },
+            },
             className: 'controlsQuickFilter htCenter htMiddle',
             colHeaders: allHeaders,
             columns: columns,
@@ -336,32 +351,29 @@ fetch('/assignment/load_data')
             ],
             beforeFilter(conditionsStack) {
                 const filtersPlugin = this.getPlugin('filters');
-                //Get the user data without the fixed rows
+                // Get the user data without the fixed rows
                 const tab = this.getData().slice(lenFixedRowsText);
 
-                let values = [];
-                const filteredResults = [];
-                //Get the number of the column to filter
-
                 if (conditionsStack && conditionsStack.length > 0) {
-                    const col = conditionsStack[0].column;
-
-                    if (conditionsStack && conditionsStack.length > 0) {
-                        for (let i = 0; i < conditionsStack.length; i++) {
-                            //Get the matching values to filter
-                            values = conditionsStack[i].conditions[0].args.flat();
-
-                            //Verify if the row value for the specific column is in the filter
-                            for (const row of tab) {
-                                if (values.includes(row[col])) {
-                                    //Push id to the filteredResults array
-                                    filteredResults.push(row[0]);
-                                }
-                            }
-                        }
+                    // Start with all row IDs as potentially valid
+                    let filteredResults = tab.map(row => row[0]); // Array of IDs
+
+                    // Process each condition and refine the filteredResults
+                    for (const condition of conditionsStack) {
+                        const col = condition.column; // Column to filter
+                        const values = condition.conditions.flatMap(c => c.args).flat(); // Values to match
+
+                        // Filter rows that match the current condition
+                        filteredResults = filteredResults.filter(id =>
+                            tab.some(row => row[0] === id && values.includes(row[col]))
+                        );
+
+                        // Exit early if no rows match any condition
+                        if (filteredResults.length === 0) break;
                     }
+
+                    // Apply the final filtered IDs to the Handsontable filter
                     filtersPlugin.clearConditions();
-                    //Create a new condition to filter the data based on the id
                     filtersPlugin.addCondition(0, 'by_value', [filteredResults]);
                 }
             },
@@ -398,7 +410,7 @@ fetch('/assignment/load_data')
                 toastNotification.show();
             });
 
-            async function saveAssignment(isDraft = false) {
+            async function saveAssignment(isDraft = false, isTeacherPublication = false) {
                 const slicedData = data.slice(lenFixedRowsText);
                 const savedData = [];
                 const commentsPlugin = table.getPlugin('comments');
@@ -436,7 +448,8 @@ fetch('/assignment/load_data')
 
                 const tableData = {
                     data: savedData,
-                    isDraft: isDraft
+                    isDraft: isDraft,
+                    isTeacherPublication: isTeacherPublication,
                 };
 
                 try {
@@ -479,7 +492,11 @@ fetch('/assignment/load_data')
                 toastNotification.show();
             });
 
-            $('#button-publish-assignments').click(async function () {
+            $('#button-publish-teachers').click(async function () {
+                await saveAssignment(false, true);
+            });
+
+            $('#button-publish-everyone').click(async function () {
                 await saveAssignment();
             });
         });
diff --git a/templates/assignment.html b/templates/assignment.html
index ba2f264..06e33f4 100644
--- a/templates/assignment.html
+++ b/templates/assignment.html
@@ -100,9 +100,18 @@ <h2 class="accordion-header" id="controlsHeading">
                                             </button>
                                         </div>
                                     </div>
-                                    <button type="button" class="btn btn-outline-dark btn-sm"
-                                            id="button-publish-assignments">Publish assignments
-                                    </button>
+                                    <div class="row g-2">
+                                        <div class="col-6">
+                                            <button type="button" class="btn btn-outline-dark btn-sm w-100"
+                                                id="button-publish-teachers" data-publication="teacher">Publish for teachers
+                                            </button>
+                                        </div>
+                                        <div class="col-6">
+                                            <button type="button" class="btn btn-outline-dark btn-sm w-100"
+                                                id="button-publish-everyone" data-publication="everyone">Publish for everyone
+                                            </button>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
diff --git a/templates/course_info.html b/templates/course_info.html
index 1fd9728..28a383a 100644
--- a/templates/course_info.html
+++ b/templates/course_info.html
@@ -32,14 +32,17 @@ <h2 class="sub-header">Assistant(s) for this year ({{ course.year }} - {{ course
             <table class="table table-hover">
                 <thead>
                 <tr>
-                    <th>Last name</th>
-                    <th>First name</th>
+                    <th>Researcher</th>
                 </tr>
                 </thead>
                 <tbody>
-                <tr>
-                    <td colspan="2">No assistants assigned this year.</td>
-                </tr>
+                    {% for assistant in course.assistants %}
+                        <tr>
+                            <td>
+                                {{ assistant.name }} {{ assistant.first_name }}
+                            </td>
+                        </tr>
+                    {% endfor %}
                 </tbody>
             </table>
             <div class="container-fluid">
@@ -72,9 +75,17 @@ <h2 class="sub-header">History</h2>
                                     <tr>
                                         <th>Last name</th>
                                         <th>First name</th>
+                                        <th>Year</th>
                                     </tr>
                                     </thead>
                                     <tbody>
+                                    {% for assistant in all_assistants %}
+                                        <tr>
+                                            <td>{{ assistant.user.name }}</td>
+                                            <td>{{ assistant.user.first_name }}</td>
+                                            <td>{{ assistant.year }}</td>
+                                        </tr>
+                                    {% endfor %}
                                     </tbody>
                                 </table>
                             </div>
diff --git a/templates/course_info_template.html b/templates/course_info_template.html
index 1ac8ab7..40f4536 100644
--- a/templates/course_info_template.html
+++ b/templates/course_info_template.html
@@ -64,7 +64,7 @@
                     <select class="form-control assigned-teachers"
                             id="assigned_teachers_{{ course.year }}"
                             name="assigned_teachers[]" multiple>
-                        {% for assigned_teacher in course.course_teacher %}
+                        {% for assigned_teacher in course.teachers %}
                             {% if assigned_teacher.course_year == course.year %}
                                 <option value="{{ assigned_teacher.user_id }}"
                                         selected>{{ assigned_teacher.user.name }} {{ assigned_teacher.user.first_name }}</option>
@@ -77,7 +77,7 @@
                 <dd>
                     <select class="form-control assigned-teachers" id="assigned_teachers"
                             name="assigned_teachers[]" multiple>
-                        {% for t in course.course_teacher %}
+                        {% for t in course.teachers %}
                             <option value="{{ t.user_id }}"
                                     selected>{{ t.user.name }} {{ t.user.first_name }}</option>
                         {% endfor %}
diff --git a/templates/courses.html b/templates/courses.html
index f574819..bf86092 100644
--- a/templates/courses.html
+++ b/templates/courses.html
@@ -38,7 +38,7 @@ <h4>Courses</h4>
                     <select class="form-select form-select-sm d-inline" id="yearSelect" name="yearSelect"
                             {% if session.is_admin == False %} disabled {% endif %}>
                         {% for config in configurations %}
-                            <option value="{{ config.year }}" {% if config.year == current_year %}
+                            <option value="{{ config.year }}" {% if config.year == year %}
                                     selected {% endif %} data-redirect="{{ url_for('course.courses', year=config.year) }}">
                                 {{ config.year }}-{{ config.year + 1 }}
                             </option>
@@ -52,7 +52,7 @@ <h4>Courses</h4>
                 <tr class="course-item"
                     data-organizations="{{ course.organizations | map(attribute='id') | join(',') }}">
                     <td>
-                        <a href="{{ url_for("course.course_info", course_id=course.id, year=current_year) }}">
+                        <a href="{{ url_for("course.course_info", course_id=course.id, year=year) }}">
                             {{ course.code }} - {{ course.title }}
                         </a>
                     </td>
diff --git a/templates/home.html b/templates/home.html
index b4b4055..15d7780 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -1,5 +1,6 @@
 {% extends "layout.html" %}
 {% block pagetitle %}Home Page{% endblock %}
+
 {% block additionalpageheader %}
     <style>
         a {
@@ -8,66 +9,78 @@
         }
     </style>
 {% endblock %}
+
 {% block pagecontent %}
-    <br>
     {% include "toast.html" %}
-    <h1>{{ session.first_name }} {{ session.name }}</h1>
-    <hr>
-    {% if is_researcher %}
-        <h2 class="sub-header">Course(s) assigned this year ({{ dynamic_year }} - {{ dynamic_year + 1 }})</h2>
-        <table class="table table-hover">
-            <thead>
-            <tr>
-                <th>Code</th>
-                <th>Title</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr>
-                <td colspan="2">No courses assigned this year.</td>
-            </tr>
-            </tbody>
-        </table>
-        <div class="container-fluid">
-            <div class="card">
+
+    <div class="container-fluid">
+        <!-- Header Section -->
+        <h1 class="mt-3 mb-3">{{ session.first_name }} {{ session.name }}</h1>
+        <hr>
+
+        <!-- Researcher Section -->
+        {% if is_researcher %}
+            <div class="card mb-3">
+                <div class="card-header mb-0">
+                    <h2 class="card-title">Course(s) assigned this year ({{ dynamic_year }}
+                        - {{ dynamic_year + 1 }})</h2>
+                </div>
                 <div class="card-body">
-                    <h2 class="sub-header">History</h2>
-                    <hr>
+                    <table class="table table-hover">
+                        <thead>
+                        <tr>
+                            <th>Course</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for course in data.researcher_current_courses %}
+                            <tr>
+                                <td>{{ course.code }} - {{ course.title }}</td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
 
-                    <!-- Nav tabs -->
-                    <ul class="nav nav-tabs" id="historyTabs" role="tablist">
+            <div class="card">
+                <div class="card-header">
+                    <h2 class="card-title mb-0">History</h2>
+                </div>
+                <div class="card-body">
+                    <ul class="nav nav-tabs mb-1" id="historyTabs" role="tablist">
                         <li class="nav-item">
                             <a class="nav-link active" id="assistants-tab" data-bs-toggle="tab" href="#assistants"
-                               role="tab"
-                               aria-controls="assistants" aria-selected="true">Assistants</a>
+                               role="tab" aria-controls="assistants" aria-selected="true">Assistants</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" id="evaluations-tab" data-bs-toggle="tab" href="#evaluations" role="tab"
                                aria-controls="evaluations" aria-selected="false">Evaluations</a>
                         </li>
                     </ul>
-
-                    <!-- Tab panes -->
                     <div class="tab-content">
-                        <!-- Assistants Pane -->
+                        <!-- Assistants Tab -->
                         <div class="tab-pane fade show active" id="assistants" role="tabpanel"
                              aria-labelledby="assistants-tab">
-                            <table class="table table-hover mt-3">
+                            <table class="table table-hover">
                                 <thead>
                                 <tr>
-                                    <th>Code</th>
-                                    <th>Title</th>
+                                    <th>Course</th>
                                     <th>Year</th>
                                 </tr>
                                 </thead>
                                 <tbody>
+                                {% for course in data.researcher_courses %}
+                                    <tr>
+                                        <td>{{ course.code }} - {{ course.title }}</td>
+                                        <td>{{ course.year }}</td>
+                                    </tr>
+                                {% endfor %}
                                 </tbody>
                             </table>
                         </div>
-                        <!-- Evaluations Pane -->
-                        <div class="tab-pane fade show" id="evaluations" role="tabpanel"
-                             aria-labelledby="evaluations-tab">
-                            <!-- Content for Evaluations -->
+                        <!-- Evaluations Tab -->
+                        <div class="tab-pane fade" id="evaluations" role="tabpanel" aria-labelledby="evaluations-tab">
                             <table class="table table-hover" id="evaluationTable">
                                 <thead>
                                 <tr>
@@ -76,7 +89,7 @@ <h2 class="sub-header">History</h2>
                                 </tr>
                                 </thead>
                                 <tbody>
-                                {% for evaluation in evaluations %}
+                                {% for evaluation in data.researcher_evaluations %}
                                     <tr>
                                         <td><a href="{{ url_for('course.course_evaluation', evaluation_id=evaluation.id) }}">
                                             {{ evaluation.course.code }} - {{ evaluation.course.title }}</a>
@@ -90,42 +103,65 @@ <h2 class="sub-header">History</h2>
                     </div>
                 </div>
             </div>
-        </div>
-    {% endif %}
-    {% if user.is_teacher %}
-        <h2 class="sub-header">My courses for ({{ dynamic_year }} - {{ dynamic_year + 1 }})</h2>
-        <table class="table table-hover">
-            <thead>
-            <tr>
-                <th>Code</th>
-                <th>Title</th>
-                <th>Assistants</th>
-            </tr>
-            </thead>
-            <tbody>
+        {% endif %}
+
+        <!-- Teacher Section -->
+        {% if user.is_teacher %}
+            <div class="card mb-4">
+                <div class="card-header">
+                    <h2 class="card-title mb-0">My courses for ({{ dynamic_year }} - {{ dynamic_year + 1 }})</h2>
+                </div>
+                <div class="card-body">
+                    <table class="table table-hover">
+                        <thead>
+                        <tr>
+                            <th>Course</th>
+                            <th>Assistants</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for course in data.teacher_courses %}
+                            <tr>
+                                <td>{{ course.code }} - {{ course.title }}</td>
+                                <td>
+                                    {% for assistant in course.assistants %}
+                                        {{ assistant.name }} {{ assistant.first_name }}<br>
+                                    {% endfor %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
 
-            {% for course in courses %}
-                <tr>
-                    <td>{{ course.code }}</td>
-                    <td>{{ course.title }}</td>
-                    <td>None</td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-        <h2 class="sub-header">Course assignments for my researchers</h2>
-        <table class="table table-hover">
-            <thead>
-            <tr>
-                <th>Code</th>
-                <th>Title</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr>
-                <td colspan="2">No course(s) this year.</td>
-            </tr>
-            </tbody>
-        </table>
-    {% endif %}
-{% endblock %}
\ No newline at end of file
+            <div class="card">
+                <div class="card-header">
+                    <h2 class="card-title mb-0">Courses assigned to my researchers</h2>
+                </div>
+                <div class="card-body">
+                    <table class="table table-hover">
+                        <thead>
+                        <tr>
+                            <th>Researcher</th>
+                            <th>Course</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {% for researcher in data.supervised_researchers %}
+                            <tr>
+                                <td>{{ researcher.user.name }} {{ researcher.user.first_name }}</td>
+                                <td>
+                                    {% for course in researcher.current_assigned_courses %}
+                                        {{ course.code }} - {{ course.title }}<br>
+                                    {% endfor %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
index 2e992c2..b1b3ba0 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -1,3 +1,4 @@
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/user.py b/user.py
index 50bbebc..2c407bc 100644
--- a/user.py
+++ b/user.py
@@ -19,7 +19,6 @@ def create_researcher(user_id, researcher_type, max_loads):
     db.session.commit()
     return new_researcher
 
-
 def get_researchers():
     return db.session.query(User).join(Researcher).filter(User.active == True).all()
 
@@ -81,8 +80,10 @@ def add_user():
 
                 if supervisor_ids:
                     supervisors = db.session.query(User).filter(User.id.in_(supervisor_ids)).all()
-                    new_researcher.supervisors = [ResearcherSupervisor(researcher=new_researcher, supervisor=s) for s in
-                                                  supervisors]
+                    supervisors_to_add = [ResearcherSupervisor(researcher=new_researcher, supervisor=s) for s in supervisors]
+                    db.session.add_all(supervisors_to_add)
+
+                    new_researcher.supervisors = supervisors_to_add
                     db.session.commit()
 
             flash("User added successfully.", "success")
@@ -111,8 +112,9 @@ def users(user_type):
         list_name = 'Archived Users'
     elif user_type == 'other':
         base_query = base_query.outerjoin(Researcher).filter(
-            User.active == True,
-            User.is_teacher == False
+            User.active == True,  # Active users
+            User.is_teacher == False,  # Not teachers
+            Researcher.id == None  # Not linked to a researcher
         )
         list_name = 'Other Users'
 
@@ -126,7 +128,7 @@ def is_allowed_user(user_id):
 
 @user_bp.route('/profile/<int:user_id>')
 @login_required
-def user_profile(user_id, ):
+def user_profile(user_id):
     current_year = get_current_year()
     if not is_allowed_user(user_id):
         flash("Permission denied. You do not have access to this page.", "error")