diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml
index 4c450566de..63ef8bb0cb 100644
--- a/.github/workflows/weekly.yaml
+++ b/.github/workflows/weekly.yaml
@@ -3,6 +3,7 @@ name: Weekly Tasks
 on:
   schedule:
     - cron: '0 0 * 6 *'
+  workflow_dispatch:
 
 jobs:
   build-mongo:
@@ -11,11 +12,21 @@ jobs:
       contents: 'read'
       id-token: 'write'
     steps:
+      - name: Maximize build space
+        uses: AdityaGarg8/remove-unwanted-software@v4.1
+        with:
+          remove-android: 'true'
+          remove-dotnet: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          remove-docker-images: 'true'
       - uses: actions/checkout@v2
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-config: ./build/standalone-db/buildkit.toml
       - id: auth
         name: Authenticate to Google Cloud
         uses: google-github-actions/auth@v1
@@ -37,14 +48,14 @@ jobs:
           password: '${{ steps.auth.outputs.access_token }}'
       - name: Get current date
         id: date
-        run: echo "date$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
+        run: echo "date=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
       - name: Generate image metadata
         id: meta
         uses: docker/metadata-action@v3
         with:
           images: |
             gcr.io/${{ secrets.DEV_PROJECT }}/sefaria-mongo
-            us-east1-docker.pkg.dev/${{ secrets.DEV_PROJECT }}/containers/sefaria-${{ matrix.app }}-${{ steps.branch-name.outputs.current_branch }}
+            us-east1-docker.pkg.dev/${{ secrets.DEV_PROJECT }}/sefaria-public/sefaria-mongo
           # generate Docker tags based on the following events/attributes
           tags: |
             type=sha,enable=true,priority=100,prefix=sha-,suffix=-${{ steps.date.outputs.date }},format=short
@@ -52,12 +63,11 @@ jobs:
           flavor: |
             latest=true
       - name: build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
-          cache-from: type=registry, ref=sefaria-mongo/cache
-          cache-to: type=registry, ref=sefaria-mongo/cache, mode=max
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64
           file: ./build/standalone-db/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/api/api_errors.py b/api/api_errors.py
new file mode 100644
index 0000000000..aac047b48d
--- /dev/null
+++ b/api/api_errors.py
@@ -0,0 +1,16 @@
+"""
+Classes for API errors
+"""
+from sefaria.client.util import jsonResponse
+
+
+class APIInvalidInputException(Exception):
+    """
+    When data in an invalid format is passed to an API
+    """
+    def __init__(self, message):
+        super().__init__(message)
+        self.message = message
+
+    def to_json_response(self):
+        return jsonResponse({"invalid_input_error": self.message}, status=400)
diff --git a/api/views.py b/api/views.py
index bd1525390a..73d4dffa67 100644
--- a/api/views.py
+++ b/api/views.py
@@ -1,6 +1,7 @@
 from sefaria.model import *
 from sefaria.model.text_reuqest_adapter import TextRequestAdapter
 from sefaria.client.util import jsonResponse
+from sefaria.system.exceptions import InputError, ComplexBookLevelRefError
 from django.views import View
 from .api_warnings import *
 
@@ -53,6 +54,12 @@ def get(self, request, *args, **kwargs):
         if return_format not in self.RETURN_FORMATS:
             return jsonResponse({'error': f'return_format should be one of those formats: {self.RETURN_FORMATS}.'}, status=400)
         text_manager = TextRequestAdapter(self.oref, versions_params, fill_in_missing_segments, return_format)
-        data = text_manager.get_versions_for_query()
-        data = self._handle_warnings(data)
+
+        try:
+            data = text_manager.get_versions_for_query()
+            data = self._handle_warnings(data)
+
+        except Exception as e:
+            return jsonResponse({'error': str(e)}, status=400)
+
         return jsonResponse(data)
diff --git a/build/standalone-db/buildkit.toml b/build/standalone-db/buildkit.toml
new file mode 100644
index 0000000000..f6dc45486d
--- /dev/null
+++ b/build/standalone-db/buildkit.toml
@@ -0,0 +1,2 @@
+[worker.oci]
+  max-parallelism = 1
diff --git a/django_topics/README.md b/django_topics/README.md
new file mode 100644
index 0000000000..d84868dd9a
--- /dev/null
+++ b/django_topics/README.md
@@ -0,0 +1,8 @@
+# Django Topics app
+
+Django app that defines models and admin interfaces for editing certain aspects of topics that are unique to Sefaria's product and not needed for general usage of Sefaria's data.
+
+Currently contains methods to:
+- Edit which topics are in which pools
+- Define topic of the day schedule
+- Define seasonal topic schedule
\ No newline at end of file
diff --git a/django_topics/__init__.py b/django_topics/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django_topics/admin.py b/django_topics/admin.py
new file mode 100644
index 0000000000..f9ce67aadc
--- /dev/null
+++ b/django_topics/admin.py
@@ -0,0 +1,229 @@
+from django.contrib import admin, messages
+from django.utils.html import format_html
+from django_topics.models import Topic, TopicPool, TopicOfTheDayEnglish, TopicOfTheDayHebrew, SeasonalTopicEnglish, SeasonalTopicHebrew
+from django_topics.models.pool import PoolType
+
+
+def create_add_to_pool_action(pool_name):
+    def add_to_pool(modeladmin, request, queryset):
+        try:
+            pool = TopicPool.objects.get(name=pool_name)
+            for topic in queryset:
+                topic.pools.add(pool)
+            modeladmin.message_user(request, f"Added {queryset.count()} topics to {pool.name}", messages.SUCCESS)
+
+        except TopicPool.DoesNotExist:
+            modeladmin.message_user(request, "The specified pool does not exist.", messages.ERROR)
+
+    add_to_pool.short_description = f"Add selected topics to '{pool_name}' pool"
+    add_to_pool.__name__ = f"add_to_specific_pool_{pool_name}"
+    return add_to_pool
+
+
+def create_remove_from_pool_action(pool_name):
+    def remove_from_pool(modeladmin, request, queryset):
+        try:
+            pool = TopicPool.objects.get(name=pool_name)
+            for topic in queryset:
+                topic.pools.remove(pool)
+            modeladmin.message_user(request, f"Removed {queryset.count()} topics from {pool.name}", messages.SUCCESS)
+
+        except TopicPool.DoesNotExist:
+            modeladmin.message_user(request, "The specified pool does not exist.", messages.ERROR)
+
+    remove_from_pool.short_description = f"Remove selected topics from '{pool_name}' pool"
+    remove_from_pool.__name__ = f"remove_from_pool_{pool_name}"
+    return remove_from_pool
+
+
+class PoolFilter(admin.SimpleListFilter):
+    title = 'Pool Filter'
+    parameter_name = 'pool'
+
+    def lookups(self, request, model_admin):
+        return [
+            ('general_en', 'General Pool EN'),
+            ('general_he', 'General Pool HE'),
+            (PoolType.TORAH_TAB.value, 'TorahTab Pool'),
+        ]
+
+    def queryset(self, request, queryset):
+        pool_name = self.value()
+        if pool_name:
+            pool = TopicPool.objects.get(name=pool_name)
+            return queryset.filter(pools=pool)
+        return queryset
+
+
+@admin.register(Topic)
+class TopicAdmin(admin.ModelAdmin):
+    list_display = ('slug', 'en_title', 'he_title', 'is_in_pool_general_en', 'is_in_pool_general_he', 'is_in_pool_torah_tab', 'sefaria_link')
+    list_filter = (PoolFilter,)
+    filter_horizontal = ('pools',)
+    search_fields = ('slug', 'en_title', 'he_title')
+    readonly_fields = ('slug', 'en_title', 'he_title')
+    actions = [
+        create_add_to_pool_action('general_en'),
+        create_add_to_pool_action('general_he'),
+        create_add_to_pool_action(PoolType.TORAH_TAB.value),
+        create_remove_from_pool_action('general_en'),
+        create_remove_from_pool_action('general_he'),
+        create_remove_from_pool_action(PoolType.TORAH_TAB.value),
+    ]
+
+    def has_add_permission(self, request):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def get_queryset(self, request):
+        queryset = super().get_queryset(request)
+        return queryset.filter(pools__name=PoolType.LIBRARY.value)
+
+    def is_in_pool_general_en(self, obj):
+        return obj.pools.filter(name='general_en').exists()
+    is_in_pool_general_en.boolean = True
+    is_in_pool_general_en.short_description = "General Pool EN"
+
+    def is_in_pool_general_he(self, obj):
+        return obj.pools.filter(name='general_he').exists()
+    is_in_pool_general_he.boolean = True
+    is_in_pool_general_he.short_description = "General Pool HE"
+
+    def is_in_pool_torah_tab(self, obj):
+        return obj.pools.filter(name=PoolType.TORAH_TAB.value).exists()
+    is_in_pool_torah_tab.boolean = True
+    is_in_pool_torah_tab.short_description = "TorahTab Pool"
+
+    def sefaria_link(self, obj):
+        url = f"https://www.sefaria.org/topics/{obj.slug}"
+        return format_html('<a href="{}" target="_blank">{}</a>', url, obj.slug)
+    sefaria_link.short_description = "Sefaria Link"
+
+
+class TopicOfTheDayAdmin(admin.ModelAdmin):
+    exclude = ("lang",)  # not for manual editing
+    list_display = ('start_date', 'topic')
+    list_filter = ('start_date',)
+    raw_id_fields = ('topic',)
+    search_fields = ('topic__slug', 'topic__en_title', 'topic__he_title')
+    date_hierarchy = 'start_date'
+    ordering = ['-start_date']
+    fieldsets = (
+        (None, {
+            'fields': ('topic', 'start_date'),
+        }),
+    )
+
+    def formfield_for_foreignkey(self, db_field, request, **kwargs):
+        if db_field.name == "topic":
+            kwargs["label"] = "Topic slug"
+            kwargs["help_text"] = "Use the magnifying glass button to select a topic."
+        return super().formfield_for_foreignkey(db_field, request, **kwargs)
+
+
+@admin.register(TopicOfTheDayEnglish)
+class TopicOfTheDayAdminEnglish(TopicOfTheDayAdmin):
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return qs.filter(lang="en")
+
+
+@admin.register(TopicOfTheDayHebrew)
+class TopicOfTheDayAdminHebrew(TopicOfTheDayAdmin):
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return qs.filter(lang="he")
+
+
+class SeasonalTopicAdmin(admin.ModelAdmin):
+    exclude = ("lang",)  # not for manual editing
+    list_display = (
+        'start_date',
+        'topic',
+        'display_date_prefix',
+        'display_date_suffix',
+        'secondary_topic',
+        'display_start_date_israel',
+        'display_end_date_israel',
+        'display_start_date_diaspora',
+        'display_end_date_diaspora'
+    )
+    raw_id_fields = ('topic', 'secondary_topic')
+    list_filter = (
+        'start_date',
+        'display_start_date_israel',
+        'display_start_date_diaspora'
+    )
+    ordering = ['-start_date']
+    search_fields = ('topic__slug', 'topic__en_title', 'topic__he_title', 'secondary_topic__slug')
+    autocomplete_fields = ('topic', 'secondary_topic')
+    date_hierarchy = 'start_date'
+    fieldsets = (
+        (None, {
+            'fields': (
+                'topic',
+                'secondary_topic',
+                'start_date'
+            )
+        }),
+        ('Display Date Prefix/Suffix', {
+            'fields': (
+                'display_date_prefix',
+                'display_date_suffix',
+            ),
+            'description': 'Prefix/Suffix that will be displayed around the secondary topic.',
+        }),
+        ('Israel Display Dates', {
+            'fields': (
+                'display_start_date_israel',
+                'display_end_date_israel'
+            ),
+            'description': 'Dates to be displayed to the user of when this topic is "happening". '
+                           'E.g. for a holiday, when the holiday occurs. '
+                           'When the dates are the same for both Israel and Diaspora, only fill out Israeli dates. '
+                           'Similarly, when the start and end dates are the same, only fill out start date.'
+        }),
+        ('Diaspora Display Dates', {
+            'fields': (
+                'display_start_date_diaspora',
+                'display_end_date_diaspora'
+            ),
+            'description': 'When the dates are the same for both Israel and Diaspora, only fill out Israeli dates. '
+                           'Similarly, when the start and end dates are the same, only fill out start date.'
+
+        }),
+    )
+
+    def formfield_for_foreignkey(self, db_field, request, **kwargs):
+        if db_field.name == "topic":
+            kwargs["label"] = "Topic slug"
+            kwargs["help_text"] = "Use the magnifying glass button to select a topic."
+        if db_field.name == "secondary_topic":
+            kwargs["label"] = "Secondary topic slug"
+        return super().formfield_for_foreignkey(db_field, request, **kwargs)
+
+    def save_model(self, request, obj, form, change):
+        """
+        Overriding the save_model to ensure the model's clean method is executed.
+        """
+        obj.clean()
+        super().save_model(request, obj, form, change)
+
+
+@admin.register(SeasonalTopicEnglish)
+class SeasonalTopicAdminEnglish(SeasonalTopicAdmin):
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return qs.filter(lang="en")
+
+
+@admin.register(SeasonalTopicHebrew)
+class SeasonalTopicAdminHebrew(SeasonalTopicAdmin):
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return qs.filter(lang="he")
diff --git a/django_topics/apps.py b/django_topics/apps.py
new file mode 100644
index 0000000000..7b405a4a58
--- /dev/null
+++ b/django_topics/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class DjangoTopicsAppConfig(AppConfig):
+    name = "django_topics"
+    verbose_name = "Topics Management"
diff --git a/django_topics/migrations/0001_initial.py b/django_topics/migrations/0001_initial.py
new file mode 100644
index 0000000000..c73e0efeeb
--- /dev/null
+++ b/django_topics/migrations/0001_initial.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-11-19 08:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SeasonalTopic',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('start_date', models.DateField()),
+                ('display_start_date_israel', models.DateField(blank=True, null=True)),
+                ('display_end_date_israel', models.DateField(blank=True, null=True)),
+                ('display_start_date_diaspora', models.DateField(blank=True, null=True)),
+                ('display_end_date_diaspora', models.DateField(blank=True, null=True)),
+            ],
+            options={
+                'verbose_name': 'Seasonal Topic',
+                'verbose_name_plural': 'Seasonal Topics',
+            },
+        ),
+        migrations.CreateModel(
+            name='Topic',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('slug', models.CharField(max_length=255, unique=True)),
+                ('en_title', models.CharField(blank=True, default='', max_length=255)),
+                ('he_title', models.CharField(blank=True, default='', max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TopicOfTheDay',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('start_date', models.DateField()),
+                ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_of_the_day', to='django_topics.Topic')),
+            ],
+            options={
+                'verbose_name': 'Topic of the Day',
+                'verbose_name_plural': 'Topics of the Day',
+            },
+        ),
+        migrations.CreateModel(
+            name='TopicPool',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, unique=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='topic',
+            name='pools',
+            field=models.ManyToManyField(blank=True, related_name='topics', to='django_topics.TopicPool'),
+        ),
+        migrations.AddField(
+            model_name='seasonaltopic',
+            name='secondary_topic',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='seasonal_secondary_topic', to='django_topics.Topic'),
+        ),
+        migrations.AddField(
+            model_name='seasonaltopic',
+            name='topic',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seasonal_topic', to='django_topics.Topic'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='topicoftheday',
+            unique_together=set([('topic', 'start_date')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='seasonaltopic',
+            unique_together=set([('topic', 'start_date')]),
+        ),
+    ]
diff --git a/django_topics/migrations/0002_auto_20241121_0617.py b/django_topics/migrations/0002_auto_20241121_0617.py
new file mode 100644
index 0000000000..ee2228f89e
--- /dev/null
+++ b/django_topics/migrations/0002_auto_20241121_0617.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-11-21 10:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_topics', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='seasonaltopic',
+            options={'verbose_name': 'Landing Page - Calendar', 'verbose_name_plural': 'Landing Page - Calendar'},
+        ),
+        migrations.AlterModelOptions(
+            name='topic',
+            options={'verbose_name': 'Topic Pool Management', 'verbose_name_plural': 'Topic Pool Management'},
+        ),
+        migrations.AlterModelOptions(
+            name='topicoftheday',
+            options={'verbose_name': 'Landing Page - Topic of the Day', 'verbose_name_plural': 'Landing Page - Topic of the Day'},
+        ),
+        migrations.AlterField(
+            model_name='seasonaltopic',
+            name='secondary_topic',
+            field=models.ForeignKey(blank=True, help_text="Secondary topic which will be displayed alongside `topic`. E.g. `topic` is 'Teshuva' then secondary topic could be 'Yom Kippur'.", null=True, on_delete=django.db.models.deletion.CASCADE, related_name='seasonal_secondary_topic', to='django_topics.Topic'),
+        ),
+        migrations.AlterField(
+            model_name='seasonaltopic',
+            name='start_date',
+            field=models.DateField(help_text='Start date of when this will appear. End date is implied by when the next Seasonal Topic is displayed.'),
+        ),
+    ]
diff --git a/django_topics/migrations/0003_auto_20241121_0757.py b/django_topics/migrations/0003_auto_20241121_0757.py
new file mode 100644
index 0000000000..a6765ce614
--- /dev/null
+++ b/django_topics/migrations/0003_auto_20241121_0757.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-11-21 11:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_topics', '0002_auto_20241121_0617'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='topic',
+            name='id',
+        ),
+        migrations.AlterField(
+            model_name='topic',
+            name='slug',
+            field=models.CharField(max_length=255, primary_key=True, serialize=False),
+        ),
+    ]
diff --git a/django_topics/migrations/0004_auto_20241126_2359.py b/django_topics/migrations/0004_auto_20241126_2359.py
new file mode 100644
index 0000000000..075a93cbf5
--- /dev/null
+++ b/django_topics/migrations/0004_auto_20241126_2359.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-11-27 03:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_topics', '0003_auto_20241121_0757'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='seasonaltopic',
+            name='display_date_prefix',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='seasonaltopic',
+            name='display_date_suffix',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='seasonaltopic',
+            name='lang',
+            field=models.CharField(default='en', max_length=255),
+            preserve_default=False,
+        ),
+    ]
diff --git a/django_topics/migrations/0005_auto_20241127_0004.py b/django_topics/migrations/0005_auto_20241127_0004.py
new file mode 100644
index 0000000000..af7ca982fd
--- /dev/null
+++ b/django_topics/migrations/0005_auto_20241127_0004.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-11-27 04:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_topics', '0004_auto_20241126_2359'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='seasonaltopic',
+            name='lang',
+            field=models.CharField(choices=[('en', 'English'), ('he', 'Hebrew')], max_length=2),
+        ),
+    ]
diff --git a/django_topics/migrations/0006_seasonaltopicenglish_seasonaltopichebrew.py b/django_topics/migrations/0006_seasonaltopicenglish_seasonaltopichebrew.py
new file mode 100644
index 0000000000..7cdded5723
--- /dev/null
+++ b/django_topics/migrations/0006_seasonaltopicenglish_seasonaltopichebrew.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-11-27 04:25
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_topics', '0005_auto_20241127_0004'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SeasonalTopicEnglish',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'English Seasonal Topic',
+                'verbose_name_plural': 'English Seasonal Topics',
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('django_topics.seasonaltopic',),
+        ),
+        migrations.CreateModel(
+            name='SeasonalTopicHebrew',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Hebrew Seasonal Topic',
+                'verbose_name_plural': 'Hebrew Seasonal Topics',
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('django_topics.seasonaltopic',),
+        ),
+    ]
diff --git a/django_topics/migrations/0007_auto_20241127_0034.py b/django_topics/migrations/0007_auto_20241127_0034.py
new file mode 100644
index 0000000000..f375c1622f
--- /dev/null
+++ b/django_topics/migrations/0007_auto_20241127_0034.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-11-27 04:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_topics', '0006_seasonaltopicenglish_seasonaltopichebrew'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TopicOfTheDayEnglish',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Landing Page - Topic of the Day (EN)',
+                'verbose_name_plural': 'Landing Page - Topic of the Day (EN)',
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('django_topics.topicoftheday',),
+        ),
+        migrations.CreateModel(
+            name='TopicOfTheDayHebrew',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Landing Page - Topic of the Day (HE)',
+                'verbose_name_plural': 'Landing Page - Topic of the Day (HE)',
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('django_topics.topicoftheday',),
+        ),
+        migrations.AlterModelOptions(
+            name='seasonaltopicenglish',
+            options={'verbose_name': 'Landing Page - Calendar (EN)', 'verbose_name_plural': 'Landing Page - Calendar (EN)'},
+        ),
+        migrations.AlterModelOptions(
+            name='seasonaltopichebrew',
+            options={'verbose_name': 'Landing Page - Calendar (HE)', 'verbose_name_plural': 'Landing Page - Calendar (HE)'},
+        ),
+        migrations.AddField(
+            model_name='topicoftheday',
+            name='lang',
+            field=models.CharField(choices=[('en', 'English'), ('he', 'Hebrew')], default='en', max_length=2),
+            preserve_default=False,
+        ),
+    ]
diff --git a/django_topics/migrations/__init__.py b/django_topics/migrations/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django_topics/models/__init__.py b/django_topics/models/__init__.py
new file mode 100644
index 0000000000..e05c9bccf9
--- /dev/null
+++ b/django_topics/models/__init__.py
@@ -0,0 +1,4 @@
+from .topic import Topic
+from .pool import TopicPool, PoolType
+from .topic_of_the_day import TopicOfTheDay, TopicOfTheDayEnglish, TopicOfTheDayHebrew
+from .seasonal_topic import SeasonalTopic, SeasonalTopicEnglish, SeasonalTopicHebrew
diff --git a/django_topics/models/pool.py b/django_topics/models/pool.py
new file mode 100644
index 0000000000..37f32be50f
--- /dev/null
+++ b/django_topics/models/pool.py
@@ -0,0 +1,15 @@
+from django.db import models
+from enum import Enum
+
+
+class PoolType(Enum):
+    LIBRARY = "library"
+    SHEETS = "sheets"
+    TORAH_TAB = "torah_tab"
+
+
+class TopicPool(models.Model):
+    name = models.CharField(max_length=255, unique=True)
+
+    def __str__(self):
+        return f"TopicPool('{self.name}')"
diff --git a/django_topics/models/seasonal_topic.py b/django_topics/models/seasonal_topic.py
new file mode 100644
index 0000000000..ff45333529
--- /dev/null
+++ b/django_topics/models/seasonal_topic.py
@@ -0,0 +1,84 @@
+from django.db import models
+from django_topics.models import Topic
+from django.core.exceptions import ValidationError
+
+
+class SeasonalTopic(models.Model):
+    topic = models.ForeignKey(
+        Topic,
+        on_delete=models.CASCADE,
+        related_name='seasonal_topic'
+    )
+    secondary_topic = models.ForeignKey(
+        Topic,
+        on_delete=models.CASCADE,
+        related_name='seasonal_secondary_topic',
+        blank=True,
+        null=True,
+        help_text="Secondary topic which will be displayed alongside `topic`. E.g. `topic` is 'Teshuva' then secondary topic could be 'Yom Kippur'."
+    )
+    start_date = models.DateField(help_text="Start date of when this will appear. End date is implied by when the next Seasonal Topic is displayed.")
+    display_start_date_israel = models.DateField(blank=True, null=True)
+    display_end_date_israel = models.DateField(blank=True, null=True)
+    display_start_date_diaspora = models.DateField(blank=True, null=True)
+    display_end_date_diaspora = models.DateField(blank=True, null=True)
+    display_date_prefix = models.CharField(max_length=255, blank=True, null=True)
+    display_date_suffix = models.CharField(max_length=255, blank=True, null=True)
+    lang = models.CharField(max_length=2, choices=[('en', 'English'), ('he', 'Hebrew')])
+
+    class Meta:
+        unique_together = ('topic', 'start_date')
+        verbose_name = "Landing Page - Calendar"
+        verbose_name_plural = "Landing Page - Calendar"
+
+    def populate_field_based_on_field(self, field, reference_field):
+        if not getattr(self, field, None) and getattr(self, reference_field, None):
+            setattr(self, field, getattr(self, reference_field))
+
+    def validate_start_end_dates(self, start_date_field, end_date_field):
+        if not getattr(self, start_date_field, None) and not getattr(self, end_date_field, None):
+            # no data
+            return
+        if not getattr(self, start_date_field, None) and getattr(self, end_date_field):
+            raise ValidationError(f"End date field '{end_date_field}' defined without start date.")
+        if getattr(self, start_date_field) > getattr(self, end_date_field):
+            raise ValidationError(f"Start date field '{start_date_field}' cannot be after end date.")
+
+    def clean(self):
+        self.populate_field_based_on_field('display_end_date_israel', 'display_start_date_israel')
+        self.populate_field_based_on_field('display_end_date_diaspora', 'display_start_date_diaspora')
+        self.populate_field_based_on_field('display_start_date_diaspora', 'display_start_date_israel')
+        self.populate_field_based_on_field('display_end_date_diaspora', 'display_end_date_israel')
+        if not getattr(self, 'display_start_date_israel') and getattr(self, 'display_start_date_diaspora'):
+            raise ValidationError("If diaspora date is defined, Israel date must also be defined.")
+        self.validate_start_end_dates('display_start_date_israel', 'display_end_date_israel')
+        self.validate_start_end_dates('display_start_date_diaspora', 'display_end_date_diaspora')
+        if self.display_date_prefix:
+            self.display_date_prefix = self.display_date_prefix.strip()
+        if self.display_date_suffix:
+            self.display_date_suffix = self.display_date_suffix.strip()
+
+    def __str__(self):
+        return f"{self.topic.slug} ({self.start_date})"
+
+
+class SeasonalTopicEnglish(SeasonalTopic):
+    class Meta:
+        proxy = True
+        verbose_name = "Landing Page - Calendar (EN)"
+        verbose_name_plural = "Landing Page - Calendar (EN)"
+
+    def save(self, *args, **kwargs):
+        self.lang = "en"
+        super().save(*args, **kwargs)
+
+
+class SeasonalTopicHebrew(SeasonalTopic):
+    class Meta:
+        proxy = True
+        verbose_name = "Landing Page - Calendar (HE)"
+        verbose_name_plural = "Landing Page - Calendar (HE)"
+
+    def save(self, *args, **kwargs):
+        self.lang = "he"
+        super().save(*args, **kwargs)
diff --git a/django_topics/models/topic.py b/django_topics/models/topic.py
new file mode 100644
index 0000000000..66fa2614b6
--- /dev/null
+++ b/django_topics/models/topic.py
@@ -0,0 +1,37 @@
+from django.db import models
+from django.db.models.query import QuerySet
+import random
+from django_topics.models.pool import TopicPool
+
+
+class TopicManager(models.Manager):
+    def sample_topic_slugs(self, order, pool: str = None, limit=10) -> list[str]:
+        if pool:
+            topics = self.get_topic_slugs_by_pool(pool)
+        else:
+            topics = self.all().values_list('slug', flat=True)
+        if order == 'random':
+            return random.sample(list(topics), min(limit, len(topics)))
+        else:
+            raise Exception("Invalid order: '{}'".format(order))
+
+    def get_pools_by_topic_slug(self, topic_slug: str) -> QuerySet:
+        return self.filter(slug=topic_slug).values_list("pools__name", flat=True)
+
+    def get_topic_slugs_by_pool(self, pool: str) -> QuerySet:
+        return self.filter(pools__name=pool).values_list("slug", flat=True)
+
+
+class Topic(models.Model):
+    slug = models.CharField(max_length=255, primary_key=True)
+    en_title = models.CharField(max_length=255, blank=True, default="")
+    he_title = models.CharField(max_length=255, blank=True, default="")
+    pools = models.ManyToManyField(TopicPool, related_name="topics", blank=True)
+    objects = TopicManager()
+
+    class Meta:
+        verbose_name = "Topic Pool Management"
+        verbose_name_plural = "Topic Pool Management"
+
+    def __str__(self):
+        return self.slug
diff --git a/django_topics/models/topic_of_the_day.py b/django_topics/models/topic_of_the_day.py
new file mode 100644
index 0000000000..30e8f22cbc
--- /dev/null
+++ b/django_topics/models/topic_of_the_day.py
@@ -0,0 +1,43 @@
+from django.db import models
+from django_topics.models import Topic
+from django.core.exceptions import ValidationError
+
+
+class TopicOfTheDay(models.Model):
+    topic = models.ForeignKey(
+        Topic,
+        on_delete=models.CASCADE,
+        related_name='topic_of_the_day'
+    )
+    start_date = models.DateField()
+    lang = models.CharField(max_length=2, choices=[('en', 'English'), ('he', 'Hebrew')])
+
+    class Meta:
+        unique_together = ('topic', 'start_date')
+        verbose_name = "Landing Page - Topic of the Day"
+        verbose_name_plural = "Landing Page - Topic of the Day"
+
+    def __str__(self):
+        return f"{self.topic.slug} ({self.start_date})"
+
+
+class TopicOfTheDayEnglish(TopicOfTheDay):
+    class Meta:
+        proxy = True
+        verbose_name = "Landing Page - Topic of the Day (EN)"
+        verbose_name_plural = "Landing Page - Topic of the Day (EN)"
+
+    def save(self, *args, **kwargs):
+        self.lang = "en"
+        super().save(*args, **kwargs)
+
+
+class TopicOfTheDayHebrew(TopicOfTheDay):
+    class Meta:
+        proxy = True
+        verbose_name = "Landing Page - Topic of the Day (HE)"
+        verbose_name_plural = "Landing Page - Topic of the Day (HE)"
+
+    def save(self, *args, **kwargs):
+        self.lang = "he"
+        super().save(*args, **kwargs)
diff --git a/helm-chart/sefaria-project/templates/configmap/gunicorn.yaml b/helm-chart/sefaria-project/templates/configmap/gunicorn.yaml
index ce7c0159cf..86644a6c18 100644
--- a/helm-chart/sefaria-project/templates/configmap/gunicorn.yaml
+++ b/helm-chart/sefaria-project/templates/configmap/gunicorn.yaml
@@ -25,6 +25,7 @@ data:
     {{- end }}
 
     loglevel = "warning"
+    preload_app = True
     
     {{- if .Values.instrumentation.enabled }}
     def post_fork(server, worker):
@@ -33,6 +34,10 @@ data:
     
     {{- end }}
 
+    def on_starting(server):
+        from reader.startup import init_library_cache
+        init_library_cache()
+
     def combined_logformat(logger, name, event_dict):
         if event_dict.get('logger') == "gunicorn.access":
             message = event_dict['event']
diff --git a/helm-chart/sefaria-project/templates/rollout/task.yaml b/helm-chart/sefaria-project/templates/rollout/task.yaml
index 3f9a233e59..af5e9cf922 100644
--- a/helm-chart/sefaria-project/templates/rollout/task.yaml
+++ b/helm-chart/sefaria-project/templates/rollout/task.yaml
@@ -82,7 +82,7 @@ spec:
           - name: SLACK_URL
             valueFrom:
               secretKeyRef:
-                name: { { template "sefaria.secrets.slackWebhook" . } }
+                name: {{ template "sefaria.secrets.slackWebhook" . }}
                 key: slack-webhook
         envFrom:
           {{- if .Values.tasks.enabled }}
diff --git a/helm-chart/sefaria-project/templates/rollout/web.yaml b/helm-chart/sefaria-project/templates/rollout/web.yaml
index 8b5837a08c..14dd148c6e 100644
--- a/helm-chart/sefaria-project/templates/rollout/web.yaml
+++ b/helm-chart/sefaria-project/templates/rollout/web.yaml
@@ -76,7 +76,7 @@ spec:
       - name: web
         image: "{{ .Values.web.containerImage.imageRegistry }}:{{ .Values.web.containerImage.tag }}"
         imagePullPolicy: Always
-        args: [ "python manage.py migrate && gunicorn sefaria.wsgi --access-logfile - --error-logfile - --timeout 300 --threads {{ .Values.web.resources.web.gunicornThreadCount }} --worker-tmp-dir /dev/shm -b 0.0.0.0:80" ]
+        args: [ "python manage.py migrate && gunicorn sefaria.wsgi --access-logfile - --error-logfile - --timeout 420 --threads {{ .Values.web.resources.web.gunicornThreadCount }} --worker-tmp-dir /dev/shm -b 0.0.0.0:80" ]
         env:
           # WEB_CONCURRENCY is used for determining the number of server workers
           - name: WEB_CONCURRENCY
diff --git a/reader/management/commands/__init__.py b/reader/management/commands/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/reader/management/commands/runserver.py b/reader/management/commands/runserver.py
new file mode 100644
index 0000000000..090485cf19
--- /dev/null
+++ b/reader/management/commands/runserver.py
@@ -0,0 +1,14 @@
+# Using staticfiles as the base class in order to not overwrite its custom runserver logic
+from django.contrib.staticfiles.management.commands.runserver import Command as RunserverCommand
+from reader.startup import init_library_cache
+import structlog
+logger = structlog.get_logger(__name__)
+
+
+class Command(RunserverCommand):
+
+    def get_handler(self, *args, **options):
+        handler = super(Command, self).get_handler(*args, **options)
+        logger.info("Starting reader application")
+        init_library_cache()
+        return handler
diff --git a/reader/startup.py b/reader/startup.py
new file mode 100644
index 0000000000..c6c3a468fc
--- /dev/null
+++ b/reader/startup.py
@@ -0,0 +1,41 @@
+
+
+def init_library_cache():
+    import django
+    django.setup()
+    import structlog
+    logger = structlog.get_logger(__name__)
+
+    from sefaria.model.text import library
+    from sefaria.system.multiserver.coordinator import server_coordinator
+    from django.conf import settings
+    logger.info("Initializing library objects.")
+    logger.info("Initializing TOC Tree")
+    library.get_toc_tree()
+
+    logger.info("Initializing Shared Cache")
+    library.init_shared_cache()
+
+    if not settings.DISABLE_AUTOCOMPLETER:
+        logger.info("Initializing Full Auto Completer")
+        library.build_full_auto_completer()
+
+        logger.info("Initializing Ref Auto Completer")
+        library.build_ref_auto_completer()
+
+        logger.info("Initializing Lexicon Auto Completers")
+        library.build_lexicon_auto_completers()
+
+        logger.info("Initializing Cross Lexicon Auto Completer")
+        library.build_cross_lexicon_auto_completer()
+
+        logger.info("Initializing Topic Auto Completer")
+        library.build_topic_auto_completer()
+
+    if settings.ENABLE_LINKER:
+        logger.info("Initializing Linker")
+        library.build_linker('he')
+
+    if server_coordinator:
+        server_coordinator.connect()
+    logger.info("Initialization Complete")
diff --git a/reader/views.py b/reader/views.py
index 112acc2364..df04826270 100644
--- a/reader/views.py
+++ b/reader/views.py
@@ -55,7 +55,7 @@
 from sefaria.site.site_settings import SITE_SETTINGS
 from sefaria.system.multiserver.coordinator import server_coordinator
 from sefaria.system.decorators import catch_error_as_json, sanitize_get_params, json_response_decorator
-from sefaria.system.exceptions import InputError, PartialRefInputError, BookNameError, NoVersionFoundError, DictionaryEntryNotFoundError
+from sefaria.system.exceptions import InputError, PartialRefInputError, BookNameError, NoVersionFoundError, DictionaryEntryNotFoundError, ComplexBookLevelRefError
 from sefaria.system.cache import django_cache
 from sefaria.system.database import db
 from sefaria.helper.search import get_query_obj
@@ -90,39 +90,6 @@
 import structlog
 logger = structlog.get_logger(__name__)
 
-#    #    #
-# Initialized cache library objects that depend on sefaria.model being completely loaded.
-logger.info("Initializing library objects.")
-logger.info("Initializing TOC Tree")
-library.get_toc_tree()
-
-logger.info("Initializing Shared Cache")
-library.init_shared_cache()
-
-if not DISABLE_AUTOCOMPLETER:
-    logger.info("Initializing Full Auto Completer")
-    library.build_full_auto_completer()
-
-    logger.info("Initializing Ref Auto Completer")
-    library.build_ref_auto_completer()
-
-    logger.info("Initializing Lexicon Auto Completers")
-    library.build_lexicon_auto_completers()
-
-    logger.info("Initializing Cross Lexicon Auto Completer")
-    library.build_cross_lexicon_auto_completer()
-
-    logger.info("Initializing Topic Auto Completer")
-    library.build_topic_auto_completer()
-
-if ENABLE_LINKER:
-    logger.info("Initializing Linker")
-    library.build_linker('he')
-
-if server_coordinator:
-    server_coordinator.connect()
-#    #    #
-
 
 def render_template(request, template_name='base.html', app_props=None, template_context=None, content_type=None, status=None, using=None):
     """
@@ -1072,6 +1039,11 @@ def user_history(request):
     desc = _("See your user history on Sefaria")
     return menu_page(request, props, page="history", title=title, desc=desc)
 
+@login_required
+def notes(request):
+    title = _("My Notes")
+    desc = _("See your notes on Sefaria")
+    return menu_page(request, page="notes", title=title, desc=desc)
 
 @login_required
 def user_stats(request):
@@ -1452,8 +1424,11 @@ def _get_text(oref, versionEn=versionEn, versionHe=versionHe, commentary=comment
             return text
 
         if not multiple or abs(multiple) == 1:
-            text = _get_text(oref, versionEn=versionEn, versionHe=versionHe, commentary=commentary, context=context, pad=pad,
-                             alts=alts, wrapLinks=wrapLinks, layer_name=layer_name)
+            try:
+                text = _get_text(oref, versionEn=versionEn, versionHe=versionHe, commentary=commentary, context=context, pad=pad,
+                                 alts=alts, wrapLinks=wrapLinks, layer_name=layer_name)
+            except Exception as e:
+                return jsonResponse({'error': str(e)}, status=400)
             return jsonResponse(text, cb)
         else:
             # Return list of many sections
@@ -3277,6 +3252,16 @@ def topic_graph_api(request, topic):
     return jsonResponse(response, callback=request.GET.get("callback", None))
 
 
+@catch_error_as_json
+def topic_pool_api(request, pool_name):
+    from django_topics.models import Topic as DjangoTopic
+    n_samples = int(request.GET.get("n"))
+    order = request.GET.get("order", "random")
+    topic_slugs = DjangoTopic.objects.sample_topic_slugs(order, pool_name, n_samples)
+    response = [Topic.init(slug).contents() for slug in topic_slugs]
+    return jsonResponse(response, callback=request.GET.get("callback", None))
+
+
 @staff_member_required
 def reorder_topics(request):
     topics = json.loads(request.POST["json"]).get("topics", [])
@@ -4270,8 +4255,9 @@ def random_by_topic_api(request):
     """
     Returns Texts API data for a random text taken from popular topic tags
     """
+    from django_topics.models import PoolType
     cb = request.GET.get("callback", None)
-    random_topic = get_random_topic('torahtab')
+    random_topic = get_random_topic(PoolType.TORAH_TAB.value)
     if random_topic is None:
         return random_by_topic_api(request)
     random_source = get_random_topic_source(random_topic)
@@ -4669,9 +4655,9 @@ def android_asset_links_json(request):
         }]
     )
 
-def application_health_api(request):
+def rollout_health_api(request):
     """
-    Defines the /healthz  and /health-check API endpoints which responds with
+    Defines the /healthz-rollout API endpoint which responds with
         200 if the application is ready for requests,
         500 if the application is not ready for requests
     """
@@ -4685,9 +4671,9 @@ def application_health_api_nonlibrary(request):
     return http.HttpResponse("Healthy", status="200")
 
 
-def rollout_health_api(request):
+def application_health_api(request):
     """
-    Defines the /healthz-rollout API endpoint which responds with
+    Defines the /healthz API endpoint which responds with
         200 if the services Django depends on, Redis, Multiserver, and NodeJs
             are available.
         500 if any of the aforementioned services are not available
diff --git a/scripts/migrations/migrate_good_to_promote_to_topic_pools.py b/scripts/migrations/migrate_good_to_promote_to_topic_pools.py
new file mode 100644
index 0000000000..7b10f547d4
--- /dev/null
+++ b/scripts/migrations/migrate_good_to_promote_to_topic_pools.py
@@ -0,0 +1,83 @@
+import django
+from django.db import IntegrityError, DataError
+
+django.setup()
+from sefaria.model import TopicSet, RefTopicLinkSet
+from django_topics.models.topic import Topic
+from django_topics.models.pool import TopicPool, PoolType
+
+
+def add_to_torah_tab_pool():
+    print('Adding topics to torah tab pool')
+    pool = TopicPool.objects.get(name=PoolType.TORAH_TAB.value)
+    ts = TopicSet({'good_to_promote': True})
+    for topic in ts:
+        t = Topic.objects.get(slug=topic.slug)
+        t.pools.add(pool)
+
+
+def add_to_library_pool():
+    print('Adding topics to library pool')
+    pool = TopicPool.objects.get(name=PoolType.LIBRARY.value)
+    ts = TopicSet({'subclass': 'author'})
+    for topic in ts:
+        t = Topic.objects.get(slug=topic.slug)
+        t.pools.add(pool)
+    links = RefTopicLinkSet({'is_sheet': False, 'linkType': 'about'})
+    topic_slugs = {link.toTopic for link in links}
+    for slug in topic_slugs:
+        try:
+            t = Topic.objects.get(slug=slug)
+            t.pools.add(pool)
+        except Topic.DoesNotExist:
+            print('Could not find topic with slug {}'.format(slug))
+
+
+def add_to_sheets_pool():
+    print('Adding topics to sheets pool')
+    pool = TopicPool.objects.get(name=PoolType.SHEETS.value)
+    links = RefTopicLinkSet({'is_sheet': True, 'linkType': 'about'})
+    topic_slugs = {link.toTopic for link in links}
+    for slug in topic_slugs:
+        try:
+            t = Topic.objects.get(slug=slug)
+            t.pools.add(pool)
+        except Topic.DoesNotExist:
+            print('Could not find topic with slug {}'.format(slug))
+
+
+def delete_all_data():
+    print("Delete data")
+    Topic.pools.through.objects.all().delete()
+    Topic.objects.all().delete()
+    TopicPool.objects.all().delete()
+
+
+def add_topics():
+    print('Adding topics')
+    for topic in TopicSet({}):
+        try:
+            Topic.objects.create(slug=topic.slug, en_title=topic.get_primary_title('en'), he_title=topic.get_primary_title('he'))
+        except IntegrityError:
+            print('Duplicate topic', topic.slug)
+        except DataError:
+            print('Data error with topic', topic.slug)
+
+
+def add_pools():
+    print('Adding pools')
+    for pool_name in [PoolType.LIBRARY.value, PoolType.SHEETS.value, 'general_en', 'general_he', PoolType.TORAH_TAB.value]:
+        TopicPool.objects.create(name=pool_name)
+
+
+def run():
+    delete_all_data()
+    add_topics()
+    add_pools()
+    add_to_torah_tab_pool()
+    add_to_library_pool()
+    add_to_sheets_pool()
+
+
+if __name__ == "__main__":
+    run()
diff --git a/sefaria/helper/linker.py b/sefaria/helper/linker.py
index 22f1e4ab67..12e767d0bf 100644
--- a/sefaria/helper/linker.py
+++ b/sefaria/helper/linker.py
@@ -2,15 +2,56 @@
 import json
 import spacy
 import structlog
+from cerberus import Validator
 from sefaria.model.linker.ref_part import TermContext, RefPartType
 from sefaria.model.linker.ref_resolver import PossiblyAmbigResolvedRef
 from sefaria.model import text, library
 from sefaria.model.webpage import WebPage
 from sefaria.system.cache import django_cache
-from typing import List, Union, Optional, Tuple
+from api.api_errors import APIInvalidInputException
+from typing import List, Optional, Tuple
 
 logger = structlog.get_logger(__name__)
 
+FIND_REFS_POST_SCHEMA = {
+    "text": {
+        "type": "dict",
+        "required": True,
+        "schema": {
+            "title": {"type": "string", "required": True},
+            "body": {"type": "string", "required": True},
+        },
+    },
+    "metaDataForTracking": {
+        "type": "dict",
+        "required": False,
+        "schema": {
+            "url": {"type": "string", "required": False},
+            "description": {"type": "string", "required": False},
+            "title": {"type": "string", "required": False},
+        },
+    },
+    "lang": {
+        "type": "string",
+        "allowed": ["he", "en"],
+        "required": False,
+    },
+    "version_preferences_by_corpus": {
+        "type": "dict",
+        "required": False,
+        "nullable": True,
+        "keysrules": {"type": "string"},
+        "valuesrules": {
+            "type": "dict",
+            "schema": {
+                "type": "string",
+                "keysrules": {"type": "string"},
+                "valuesrules": {"type": "string"},
+            },
+        },
+    },
+}
+
 
 def load_spacy_model(path: str) -> spacy.Language:
     import re, tarfile
@@ -64,13 +105,12 @@ class _FindRefsText:
     body: str
     lang: str
 
-    # def __post_init__(self):
-    #     from sefaria.utils.hebrew import is_mostly_hebrew
-    #     self.lang = 'he' if is_mostly_hebrew(self.body) else 'en'
-
 
 def _unpack_find_refs_request(request):
+    validator = Validator(FIND_REFS_POST_SCHEMA)
     post_body = json.loads(request.body)
+    if not validator.validate(post_body):
+        raise APIInvalidInputException(validator.errors)
     meta_data = post_body.get('metaDataForTracking')
     return _create_find_refs_text(post_body), _create_find_refs_options(request.GET, post_body), meta_data
 
diff --git a/sefaria/helper/tests/linker_test.py b/sefaria/helper/tests/linker_test.py
index e4afc30574..8779429e77 100644
--- a/sefaria/helper/tests/linker_test.py
+++ b/sefaria/helper/tests/linker_test.py
@@ -10,6 +10,7 @@
 from sefaria.model.text import Ref, TextChunk
 from sefaria.model.webpage import WebPage
 from sefaria.settings import ENABLE_LINKER
+from api.api_errors import APIInvalidInputException
 
 if not ENABLE_LINKER:
     pytest.skip("Linker not enabled", allow_module_level=True)
@@ -80,6 +81,12 @@ def mock_request_post_data_without_meta_data(mock_request_post_data: dict) -> di
     return mock_request_post_data
 
 
+@pytest.fixture
+def mock_request_invalid_post_data(mock_request_post_data: dict) -> dict:
+    mock_request_post_data['text'] = 'plain text'
+    return mock_request_post_data
+
+
 def make_mock_request(post_data: dict) -> WSGIRequest:
     factory = RequestFactory()
     request = factory.post('/api/find-refs', data=json.dumps(post_data), content_type='application/json')
@@ -109,6 +116,11 @@ def mock_request_without_meta_data(mock_request_post_data_without_meta_data: dic
     return make_mock_request(mock_request_post_data_without_meta_data)
 
 
+@pytest.fixture
+def mock_request_invalid(mock_request_invalid_post_data: dict) -> WSGIRequest:
+    return make_mock_request(mock_request_invalid_post_data)
+
+
 @pytest.fixture
 def mock_webpage() -> WebPage:
     # Note, the path of WebPage matches the path of the import we want to patch
@@ -162,6 +174,13 @@ def test_make_find_refs_response_without_meta_data(self, mock_request_without_me
         mock_webpage.add_hit.assert_not_called()
         mock_webpage.save.assert_not_called()
 
+    def test_make_find_refs_response_invalid_post_data(self, mock_request_invalid: dict,
+                                                       mock_webpage: Mock):
+        with pytest.raises(APIInvalidInputException) as exc_info:
+            response = linker.make_find_refs_response(mock_request_invalid)
+        # assert that the 'text' field had a validation error
+        assert 'text' in exc_info.value.args[0]
+
 
 class TestUnpackFindRefsRequest:
     def test_unpack_find_refs_request(self, mock_request: WSGIRequest):
@@ -198,8 +217,8 @@ def mock_get_linker(self, spacy_model: spacy.Language):
         with patch.object(library, 'get_linker') as mock_get_linker:
             mock_linker = Mock()
             mock_get_linker.return_value = mock_linker
-            mock_linker.link.return_value = LinkedDoc('', [], [])
-            mock_linker.link_by_paragraph.return_value = LinkedDoc('', [], [])
+            mock_linker.link.return_value = LinkedDoc('', [], [], [])
+            mock_linker.link_by_paragraph.return_value = LinkedDoc('', [], [], [])
             yield mock_get_linker
 
     def test_make_find_refs_response_linker_v3(self, mock_get_linker: WSGIRequest,
diff --git a/sefaria/helper/topic.py b/sefaria/helper/topic.py
index 8203a06b31..05f8d3cb4f 100644
--- a/sefaria/helper/topic.py
+++ b/sefaria/helper/topic.py
@@ -285,15 +285,12 @@ def get_random_topic(pool=None) -> Optional[Topic]:
     :param pool: name of the pool from which to select the topic. If `None`, all topics are considered.
     :return: Returns a random topic from the database. If you provide `pool`, then the selection is limited to topics in that pool.
     """
-    query = {"pools": pool} if pool else {}
-    random_topic_dict = list(db.topics.aggregate([
-        {"$match": query},
-        {"$sample": {"size": 1}}
-    ]))
-    if len(random_topic_dict) == 0:
+    from django_topics.models import Topic as DjangoTopic
+    random_topic_slugs = DjangoTopic.objects.sample_topic_slugs('random', pool, limit=1)
+    if len(random_topic_slugs) == 0:
         return None
 
-    return Topic(random_topic_dict[0])
+    return Topic.init(random_topic_slugs[0])
 
 
 def get_random_topic_source(topic:Topic) -> Optional[Ref]:
@@ -732,15 +729,16 @@ def calculate_other_ref_scores(ref_topic_map):
     return num_datasource_map, langs_available, comp_date_map, order_id_map
 
 
-def update_ref_topic_link_orders(sheet_source_links, sheet_topic_links):
-    other_ref_topic_links = list(RefTopicLinkSet({"is_sheet": False, "generatedBy": {"$ne": TopicLinkHelper.generated_by_sheets}}))
-    ref_topic_links = other_ref_topic_links + sheet_source_links
+def update_ref_topic_link_orders(source_links, sheet_topic_links):
+    """
 
-    topic_tref_score_map, ref_topic_map = calculate_mean_tfidf(ref_topic_links)
+    @param source_links: Links between sources and topics (as opposed to sheets and topics)
+    @param sheet_topic_links: Links between sheets and topics
+    """
+    topic_tref_score_map, ref_topic_map = calculate_mean_tfidf(source_links)
     num_datasource_map, langs_available, comp_date_map, order_id_map = calculate_other_ref_scores(ref_topic_map)
     pr_map, pr_seg_map = calculate_pagerank_scores(ref_topic_map)
     sheet_cache = {}
-    intra_topic_link_cache = {}
 
     def get_sheet_order(topic_slug, sheet_id):
         if sheet_id in sheet_cache:
@@ -800,7 +798,7 @@ def get_sheet_order(topic_slug, sheet_id):
         }
 
     all_ref_topic_links_updated = []
-    all_ref_topic_links = sheet_topic_links + ref_topic_links
+    all_ref_topic_links = sheet_topic_links + source_links
     for l in tqdm(all_ref_topic_links, desc='update link orders'):
         if l.is_sheet:
             setattr(l, 'order', get_sheet_order(l.toTopic, int(l.ref.replace("Sheet ", ""))))
@@ -965,15 +963,18 @@ def calculate_popular_writings_for_authors(top_n, min_pr):
             }).save()
 
 def recalculate_secondary_topic_data():
-    sheet_source_links = RefTopicLinkSet({'pools': 'textual'})
-    sheet_topic_links = RefTopicLinkSet({'pools': 'sheets'})
-    sheet_related_links = IntraTopicLinkSet()
+    source_links = RefTopicLinkSet({'is_sheet': False})
+    sheet_links = [RefTopicLink(l) for l in generate_sheet_topic_links()]
+
+    related_links = update_intra_topic_link_orders(IntraTopicLinkSet())
+    all_ref_links = update_ref_topic_link_orders(source_links.array(), sheet_links)
 
-    related_links = update_intra_topic_link_orders(sheet_related_links)
-    all_ref_links = update_ref_topic_link_orders(sheet_source_links.array(), sheet_topic_links.array())
+    RefTopicLinkSet({"is_sheet": True}).delete()
 
     db.topic_links.bulk_write([
         UpdateOne({"_id": l._id}, {"$set": {"order": l.order}})
+        if getattr(l, "_id", False) else
+        InsertOne(l.contents(for_db=True))
         for l in (all_ref_links + related_links)
     ])
 
diff --git a/sefaria/model/tests/topic_test.py b/sefaria/model/tests/topic_test.py
index 56345624f1..47c8ceb5e5 100644
--- a/sefaria/model/tests/topic_test.py
+++ b/sefaria/model/tests/topic_test.py
@@ -3,7 +3,7 @@
 from sefaria.model.text import Ref
 from sefaria.system.database import db
 from sefaria.system.exceptions import SluggedMongoRecordMissingError
-from sefaria.helper.topic import update_topic
+from django_topics.models import Topic as DjangoTopic, TopicPool
 
 
 def make_topic(slug):
@@ -105,6 +105,13 @@ def topic_graph_to_merge():
     db.sheets.delete_one({"id": 1234567890})
 
 
+@pytest.fixture(scope='module')
+def topic_pool():
+    pool = TopicPool.objects.create(name='test-pool')
+    yield pool
+    pool.delete()
+
+
 class TestTopics(object):
 
     def test_graph_funcs(self, topic_graph):
@@ -155,6 +162,38 @@ def test_merge(self, topic_graph_to_merge):
             {"slug": '30', 'asTyped': 'thirty'}
         ]
 
+        t40 = Topic.init('40')
+        assert t40 is None
+        DjangoTopic.objects.get(slug='20')
+        with pytest.raises(DjangoTopic.DoesNotExist):
+            DjangoTopic.objects.get(slug='40')
+
+    def test_change_title(self, topic_graph):
+        ts = topic_graph['topics']
+        dt1 = DjangoTopic.objects.get(slug=ts['1'].slug)
+        assert dt1.en_title == ts['1'].get_primary_title('en')
+        ts['1'].title_group.add_title('new title', 'en', True, True)
+        ts['1'].save()
+        dt1 = DjangoTopic.objects.get(slug=ts['1'].slug)
+        assert dt1.en_title == ts['1'].get_primary_title('en')
+
+    def test_pools(self, topic_graph, topic_pool):
+        ts = topic_graph['topics']
+        t1 = ts['1']
+        assert len(t1.get_pools()) == 0
+        t1.add_pool(topic_pool.name)
+        assert t1.get_pools() == [topic_pool.name]
+
+        # dont add duplicates
+        t1.add_pool(topic_pool.name)
+        assert t1.get_pools() == [topic_pool.name]
+
+        assert t1.has_pool(topic_pool.name)
+        t1.remove_pool(topic_pool.name)
+        assert len(t1.get_pools()) == 0
+        # dont error when removing non-existant pool
+        t1.remove_pool(topic_pool.name)
+
     def test_sanitize(self):
         t = Topic()
         t.slug = "sdfsdg<script/>"
diff --git a/sefaria/model/text.py b/sefaria/model/text.py
index 3bc15026e3..6e088c9589 100644
--- a/sefaria/model/text.py
+++ b/sefaria/model/text.py
@@ -25,7 +25,7 @@
 import sefaria.system.cache as scache
 from sefaria.system.cache import in_memory_cache
 from sefaria.system.exceptions import InputError, BookNameError, PartialRefInputError, IndexSchemaError, \
-    NoVersionFoundError, DictionaryEntryNotFoundError, MissingKeyError
+    NoVersionFoundError, DictionaryEntryNotFoundError, MissingKeyError, ComplexBookLevelRefError
 from sefaria.utils.hebrew import has_hebrew, is_all_hebrew, hebrew_term
 from sefaria.utils.util import list_depth, truncate_string
 from sefaria.datatype.jagged_array import JaggedTextArray, JaggedArray
@@ -1700,7 +1700,7 @@ def __init__(self, oref, lang, vtitle, merge_versions=False, versions=None):
         elif oref.has_default_child(): #use default child:
             self.oref = oref.default_child_ref()
         else:
-            raise InputError("Can not get TextRange at this level, please provide a more precise reference")
+            raise ComplexBookLevelRefError(book_ref=oref.normal())
         self.lang = lang
         self.vtitle = vtitle
         self.merge_versions = merge_versions
@@ -2434,7 +2434,7 @@ def __init__(self, oref, context=1, commentary=True, version=None, lang=None,
         self._alts          = []
 
         if not isinstance(oref.index_node, JaggedArrayNode) and not oref.index_node.is_virtual:
-            raise InputError("Can not get TextFamily at this level, please provide a more precise reference")
+            raise InputError("Unable to find text for that ref")
 
         for i in range(0, context):
             oref = oref.context_ref()
@@ -4000,8 +4000,10 @@ def padded_ref(self):
             except AttributeError:  # This is a schema node, try to get a default child
                 if self.has_default_child():
                     return self.default_child_ref().padded_ref()
+                elif self.is_book_level():
+                    raise ComplexBookLevelRefError(book_ref=self.normal())
                 else:
-                    raise InputError("Can not pad a schema node ref")
+                    raise InputError("Cannot pad a schema node ref.")
 
             d = self._core_dict()
             if self.is_talmud():
diff --git a/sefaria/model/topic.py b/sefaria/model/topic.py
index ef48716027..7a60701c3d 100644
--- a/sefaria/model/topic.py
+++ b/sefaria/model/topic.py
@@ -1,9 +1,10 @@
-from enum import Enum
 from typing import Union, Optional
 from . import abstract as abst
 from .schema import AbstractTitledObject, TitleGroup
 from .text import Ref, IndexSet, AbstractTextRecord, Index, Term
 from .category import Category
+from django_topics.models import Topic as DjangoTopic
+from django_topics.models import TopicPool, PoolType
 from sefaria.system.exceptions import InputError, DuplicateRecordError
 from sefaria.model.timeperiod import TimePeriod, LifePeriod
 from sefaria.system.validators import validate_url
@@ -121,11 +122,6 @@ def __hash__(self):
         return hash((self.collective_title, self.base_cat_path))
 
 
-class Pool(Enum):
-    TEXTUAL = "textual"
-    SHEETS = "sheets"
-
-
 class Topic(abst.SluggedAbstractMongoRecord, AbstractTitledObject):
     collection = 'topics'
     history_noun = 'topic'
@@ -160,11 +156,8 @@ class Topic(abst.SluggedAbstractMongoRecord, AbstractTitledObject):
         "data_source",  #any topic edited manually should display automatically in the TOC and this flag ensures this
         'image',
         "portal_slug",  # slug to relevant Portal object
-        'pools',  # list of strings, any of them represents a pool that this topic is member of
     ]
 
-    allowed_pools = [pool.value for pool in Pool] + ['torahtab']
-
     attr_schemas = {
         "image": {
             'type': 'dict',
@@ -176,14 +169,7 @@ class Topic(abst.SluggedAbstractMongoRecord, AbstractTitledObject):
                                          'schema': {'en': {'type': 'string', 'required': True},
                                                     'he': {'type': 'string', 'required': True}}}}
             },
-        'pools': {
-                'type': 'list',
-                'schema': {
-                    'type': 'string',
-                    'allowed': allowed_pools
-                }
-            }
-        }
+    }
 
     ROOT = "Main Menu"  # the root of topic TOC is not a topic, so this is a fake slug.  we know it's fake because it's not in normal form
                         # this constant is helpful in the topic editor tool functions in this file
@@ -204,6 +190,13 @@ def _set_derived_attributes(self):
             # in a subclass. set appropriate "subclass" attribute
             setattr(self, "subclass", self.reverse_subclass_map[self.__class__.__name__])
 
+    def _pre_save(self):
+        super()._pre_save()
+        django_topic, created = DjangoTopic.objects.get_or_create(slug=self.slug)
+        django_topic.en_title = self.get_primary_title('en')
+        django_topic.he_title = self.get_primary_title('he')
+        django_topic.save()
+
     def _validate(self):
         super(Topic, self)._validate()
         if getattr(self, 'subclass', False):
@@ -224,10 +217,6 @@ def _normalize(self):
         displays_under_link = IntraTopicLink().load({"fromTopic": slug, "linkType": "displays-under"})
         if getattr(displays_under_link, "toTopic", "") == "authors":
             self.subclass = "author"
-        if self.get_pools():
-            self.pools = sorted(set(self.get_pools()))
-        elif hasattr(self, 'pools'):
-            delattr(self, 'pools')
 
     def _sanitize(self):
         super()._sanitize()
@@ -237,19 +226,24 @@ def _sanitize(self):
                 p[k] = bleach.clean(v, tags=[], strip=True)
             setattr(self, attr, p)
 
-    def get_pools(self):
-        return getattr(self, 'pools', [])
+    def get_pools(self) -> list[str]:
+        slug = getattr(self, "slug", None)
+        return list(DjangoTopic.objects.get_pools_by_topic_slug(str(slug))) if slug is not None else []
 
-    def has_pool(self, pool):
+    def has_pool(self, pool: str) -> bool:
         return pool in self.get_pools()
 
-    def add_pool(self, pool): #does not save!
-        self.pools = self.get_pools()
-        self.pools.append(pool)
+    def add_pool(self, pool_name: str) -> None:
+        pool = TopicPool.objects.get(name=pool_name)
+        DjangoTopic.objects.get(slug=self.slug).pools.add(pool)
+        if not self.has_pool(pool_name):
+            self.get_pools().append(pool_name)
 
-    def remove_pool(self, pool): #does not save!
-        pools = self.get_pools()
-        pools.remove(pool)
+    def remove_pool(self, pool_name) -> None:
+        pool = TopicPool.objects.get(name=pool_name)
+        DjangoTopic.objects.get(slug=self.slug).pools.remove(pool)
+        if self.has_pool(pool_name):
+            self.get_pools().remove(pool_name)
 
     def set_titles(self, titles):
         self.title_group = TitleGroup(titles)
@@ -393,10 +387,10 @@ def set_slug(self, new_slug) -> None:
         old_slug = getattr(self, slug_field)
         setattr(self, slug_field, new_slug)
         setattr(self, slug_field, self.normalize_slug_field(slug_field))
+        DjangoTopic.objects.filter(slug=old_slug).update(slug=new_slug)
         self.save()  # so that topic with this slug exists when saving links to it
         self.merge(old_slug)
 
-
     def merge(self, other: Union['Topic', str]) -> None:
         """
         Merge `other` into `self`. This means that all data from `other` will be merged into self.
@@ -498,8 +492,6 @@ def get_ref_links(self, is_sheet, query_kwargs=None, **kwargs):
     def contents(self, **kwargs):
         mini = kwargs.get('minify', False)
         d = {'slug': self.slug} if mini else super(Topic, self).contents(**kwargs)
-        if kwargs.get('remove_pools', True):
-            d.pop('pools', None)
         d['primaryTitle'] = {}
         for lang in ('en', 'he'):
             d['primaryTitle'][lang] = self.get_primary_title(lang=lang, with_disambiguation=kwargs.get('with_disambiguation', True))
@@ -565,7 +557,7 @@ def update_after_link_change(self, pool):
         updating the pools 'sheets' or 'textual' according to the existence of links and the numSources
         :param pool: 'sheets' or 'textual'
         """
-        links = self.get_ref_links(pool == Pool.SHEETS.value)
+        links = self.get_ref_links(pool == PoolType.SHEETS.value)
         if self.has_pool(pool) and not links:
             self.remove_pool(pool)
         elif not self.has_pool(pool) and links:
@@ -970,7 +962,7 @@ def set_description(self, lang, title, prompt):
         return self
 
     def get_related_pool(self):
-        return Pool.SHEETS.value if self.is_sheet else Pool.TEXTUAL.value
+        return PoolType.SHEETS.value if self.is_sheet else PoolType.LIBRARY.value
 
     def get_topic(self):
         return Topic().load({'slug': self.toTopic})
@@ -1175,6 +1167,10 @@ def process_topic_delete(topic):
     for sheet in db.sheets.find({"topics.slug": topic.slug}):
         sheet["topics"] = [t for t in sheet["topics"] if t["slug"] != topic.slug]
         db.sheets.save(sheet)
+    try:
+        DjangoTopic.objects.get(slug=topic.slug).delete()
+    except DjangoTopic.DoesNotExist:
+        print('Topic {} does not exist in django'.format(topic.slug))
 
 def process_topic_description_change(topic, **kwargs):
     """
diff --git a/sefaria/search.py b/sefaria/search.py
index 198ad66e4c..ef534422ed 100644
--- a/sefaria/search.py
+++ b/sefaria/search.py
@@ -10,8 +10,6 @@
 import bleach
 import pymongo
 
-# To allow these files to be run directly from command line (w/o Django shell)
-os.environ['DJANGO_SETTINGS_MODULE'] = "settings"
 
 import structlog
 import logging
@@ -504,7 +502,9 @@ def index_all(cls, index_name, debug=False, for_es=True, action=None):
         total_versions = len(versions)
         versions = None  # release RAM
         for title, vlist in list(versions_by_index.items()):
-            cls.curr_index = vlist[0].get_index() if len(vlist) > 0 else None
+            if len(vlist) == 0:
+                continue
+            cls.curr_index = vlist[0].get_index()
             if for_es:
                 cls._bulk_actions = []
                 try:
diff --git a/sefaria/settings.py b/sefaria/settings.py
index 7eea25ff70..939d46c405 100644
--- a/sefaria/settings.py
+++ b/sefaria/settings.py
@@ -138,12 +138,13 @@
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
+    'reader',
     'django.contrib.staticfiles',
     'django.contrib.humanize',
     'emailusernames',
-    'reader',
     'sourcesheets',
     'sefaria.gauth',
+    'django_topics.apps.DjangoTopicsAppConfig',
     'captcha',
     'django.contrib.admin',
     'anymail',
diff --git a/sefaria/system/exceptions.py b/sefaria/system/exceptions.py
index 72d3493f78..de010b46da 100644
--- a/sefaria/system/exceptions.py
+++ b/sefaria/system/exceptions.py
@@ -99,3 +99,14 @@ def __init__(self, method):
         self.method = method
         self.message = f"'{method}' is not a valid HTTP API method."
         super().__init__(self.message)
+
+
+class ComplexBookLevelRefError(InputError):
+    def __init__(self, book_ref):
+        self.book_ref = book_ref
+        self.message = (f"You passed '{book_ref}', please pass a more specific ref for this book, and try again. "
+                        f"'{book_ref}' is a \'complex\' book-level ref. We only support book-level "
+                        f"refs in cases of texts with a 'simple' structure. To learn more about the "
+                        f"structure of a text on Sefaria, "
+                        f"see: https://developers.sefaria.org/docs/the-schema-of-a-simple-text")
+        super().__init__(self.message)
diff --git a/sefaria/system/middleware.py b/sefaria/system/middleware.py
index 0e67309ded..64937c2f19 100644
--- a/sefaria/system/middleware.py
+++ b/sefaria/system/middleware.py
@@ -16,6 +16,9 @@
 from sefaria.system.cache import get_shared_cache_elem, set_shared_cache_elem
 from django.utils.deprecation import MiddlewareMixin
 
+import structlog
+logger = structlog.get_logger(__name__)
+
 
 class SharedCacheMiddleware(MiddlewareMixin):
     def process_request(self, request):
diff --git a/sefaria/urls.py b/sefaria/urls.py
index c5140b907c..f306019e53 100644
--- a/sefaria/urls.py
+++ b/sefaria/urls.py
@@ -30,6 +30,7 @@
     url(r'^$', reader_views.home, name="home"),
     url(r'^texts/?$', reader_views.texts_list, name="table_of_contents"),
     url(r'^texts/saved/?$', reader_views.saved),
+    url(r'^texts/notes/?$', reader_views.notes),
     url(r'^texts/history/?$', reader_views.user_history),
     url(r'^texts/recent/?$', reader_views.old_recent_redirect),
     url(r'^texts/(?P<cats>.+)?$', reader_views.texts_category_list),
@@ -270,6 +271,7 @@
     url(r'^api/topics$', reader_views.topics_list_api),
     url(r'^api/topics/generate-prompts/(?P<slug>.+)$', reader_views.generate_topic_prompts_api),
     url(r'^api/topics-graph/(?P<topic>.+)$', reader_views.topic_graph_api),
+    url(r'^api/topics/pools/(?P<pool_name>.+)$', reader_views.topic_pool_api),
     url(r'^api/ref-topic-links/bulk$', reader_views.topic_ref_bulk_api),
     url(r'^api/ref-topic-links/(?P<tref>.+)$', reader_views.topic_ref_api),
     url(r'^api/v2/topics/(?P<topic>.+)$', reader_views.topics_api, {'v2': True}),
diff --git a/sefaria/views.py b/sefaria/views.py
index 80f3939e0d..71bf51d404 100644
--- a/sefaria/views.py
+++ b/sefaria/views.py
@@ -47,6 +47,7 @@
 from sefaria.datatype.jagged_array import JaggedTextArray
 # noinspection PyUnresolvedReferences
 from sefaria.system.exceptions import InputError, NoVersionFoundError
+from api.api_errors import APIInvalidInputException
 from sefaria.system.database import db
 from sefaria.system.decorators import catch_error_as_http
 from sefaria.utils.hebrew import has_hebrew, strip_nikkud
@@ -339,7 +340,10 @@ def find_refs_report_api(request):
 @api_view(["POST"])
 def find_refs_api(request):
     from sefaria.helper.linker import make_find_refs_response
-    return jsonResponse(make_find_refs_response(request))
+    try:
+        return jsonResponse(make_find_refs_response(request))
+    except APIInvalidInputException as e:
+        return e.to_json_response()
 
 
 @api_view(["GET"])
diff --git a/sefaria/wsgi.py b/sefaria/wsgi.py
index 502d6bb1cc..d0edead763 100644
--- a/sefaria/wsgi.py
+++ b/sefaria/wsgi.py
@@ -23,6 +23,7 @@
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
 
+
 # Apply WSGI middleware here.
 # from helloworld.wsgi import HelloWorldApplication
 # application = HelloWorldApplication(application)
diff --git a/static/css/s2.css b/static/css/s2.css
index 0ee1058b4d..e02924dfcd 100644
--- a/static/css/s2.css
+++ b/static/css/s2.css
@@ -386,6 +386,9 @@ body.hasBannerMessage {
   transition: padding-top .3s;
   padding-top: 120px;
 }
+body.hasBannerMessage:not(:has(#bannerMessage)) {
+  padding-top: 0;
+}
 body.hasBannerMessage #s2.headerOnly {
   height: 180px;
 }
@@ -8489,7 +8492,7 @@ a.sheetAuthorName {
   --english-font: var(--english-sans-serif-font-family);
   --hebrew-font: var(--hebrew-sans-serif-font-family);
   font-size: 16px;
-  font-weight: 600;
+  font-weight: 500;
   line-height: 18.75px;
   display: inline;
   margin-block-end: 10px;
@@ -9235,6 +9238,7 @@ div.aboutSheetMetadata span:not(:first-child)::before{
 .noteListing {
   margin-bottom: 30px;
   border-bottom: 1px solid #ccc;
+  padding-bottom: 10px;
 }
 .noteListing a:hover {
   text-decoration: none;
@@ -10006,6 +10010,7 @@ span.purim-emoji img{
 /* Sheets */
 
 .sheetsInPanel {
+  font-size: 62.5%;
   overflow-y: scroll;
   overflow-x: hidden;
   height: 100%;
@@ -13824,7 +13829,7 @@ span.ref-link-color-3 {color: blue}
   --english-font: var(--english-sans-serif-font-family);
   --hebrew-font: var(--hebrew-sans-serif-font-family);
   font-size: 14px;
-  font-weight: 600;
+  font-weight: 500;
   line-height: 18px;
   color: #666666;
   margin-inline-start: 10px;
@@ -14238,4 +14243,4 @@ span.ref-link-color-3 {color: blue}
 75%{box-shadow:0 -2.6em 0 0 rgba(0,0,0,0.2),1.8em -1.8em 0 0 rgba(0,0,0,0.2),2.5em 0 0 0 rgba(0,0,0,0.2),1.75em 1.75em 0 0 rgba(0,0,0,0.2),0 2.5em 0 0 rgba(0,0,0,0.5),-1.8em 1.8em 0 0 rgba(0,0,0,0.7),-2.6em 0 0 0 #ffffff,-1.8em -1.8em 0 0 rgba(0,0,0,0.2)}
 87.5%{box-shadow:0 -2.6em 0 0 rgba(0,0,0,0.2),1.8em -1.8em 0 0 rgba(0,0,0,0.2),2.5em 0 0 0 rgba(0,0,0,0.2),1.75em 1.75em 0 0 rgba(0,0,0,0.2),0 2.5em 0 0 rgba(0,0,0,0.2),-1.8em 1.8em 0 0 rgba(0,0,0,0.5),-2.6em 0 0 0 rgba(0,0,0,0.7),-1.8em -1.8em 0 0 #fff}
 }
-/* end css code for loading bezel */
\ No newline at end of file
+/* end css code for loading bezel */
diff --git a/static/files/Sefaria_2023_990_Public.pdf b/static/files/Sefaria_2023_990_Public.pdf
new file mode 100644
index 0000000000..4fc2140ca1
Binary files /dev/null and b/static/files/Sefaria_2023_990_Public.pdf differ
diff --git a/static/icons/notes-icon.svg b/static/icons/notes-icon.svg
new file mode 100644
index 0000000000..ca78771d8f
--- /dev/null
+++ b/static/icons/notes-icon.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.83333 7.58333H3.5V7H5.83333V7.58333ZM7.1855 5.082L9.11108 7.00642L6.5625 7.58333L7.1855 5.082ZM14 2.12917L9.76033 6.41842L7.77642 4.43392L12.0155 0.14525L14 2.12917ZM10.5 7.33017V7.90008C10.5 10.2958 7 9.33333 7 9.33333C7 9.33333 7.8855 12.8333 5.46117 12.8333H1.16667V1.16667H9.366L10.5193 0H0V14H5.94358C7.78867 14 11.6667 9.78658 11.6667 8.39183V6.15008L10.5 7.33017Z" fill="#666666"/>
+</svg>
diff --git a/static/js/AboutBox.jsx b/static/js/AboutBox.jsx
index 791b77e42c..1ede90b49b 100644
--- a/static/js/AboutBox.jsx
+++ b/static/js/AboutBox.jsx
@@ -5,7 +5,7 @@ import VersionBlock, {VersionsBlocksList} from './VersionBlock/VersionBlock';
 import Component             from 'react-class';
 import {InterfaceText} from "./Misc";
 import {ContentText} from "./ContentText";
-import { Modules } from './NavSidebar';
+import { SidebarModules } from './NavSidebar';
 
 
 class AboutBox extends Component {
@@ -232,8 +232,8 @@ class AboutBox extends Component {
           (<div>{versionSectionEn}{versionSectionHe}{alternateSectionHe}</div>) :
           (<div>{versionSectionHe}{versionSectionEn}{alternateSectionHe}</div>)
         }
-        <Modules type={"RelatedTopics"} props={{title: this.props.title}} />
-        { !isDictionary ? <Modules type={"DownloadVersions"} props={{sref: this.props.title}} /> : null}
+        <SidebarModules type={"RelatedTopics"} props={{title: this.props.title}} />
+        { !isDictionary ? <SidebarModules type={"DownloadVersions"} props={{sref: this.props.title}} /> : null}
       </section>
     );
   }
diff --git a/static/js/BookPage.jsx b/static/js/BookPage.jsx
index 85b6891141..3469dbd436 100644
--- a/static/js/BookPage.jsx
+++ b/static/js/BookPage.jsx
@@ -19,7 +19,7 @@ import React, { useState, useRef }  from 'react';
 import ReactDOM  from 'react-dom';
 import $  from './sefaria/sefariaJquery';
 import Sefaria  from './sefaria/sefaria';
-import { NavSidebar, Modules } from './NavSidebar';
+import { NavSidebar, SidebarModules } from './NavSidebar';
 import DictionarySearch  from './DictionarySearch';
 import VersionBlock  from './VersionBlock/VersionBlock';
 import ExtendedNotes from './ExtendedNotes';
@@ -271,7 +271,7 @@ class BookPage extends Component {
 
                 {this.props.multiPanel ? null :
                 <div className="about">
-                  <Modules type={"AboutText"} props={{index: this.state.indexDetails, hideTitle: true}} />
+                  <SidebarModules type={"AboutText"} props={{index: this.state.indexDetails, hideTitle: true}} />
                 </div>}
 
                  <TabView
@@ -302,7 +302,7 @@ class BookPage extends Component {
               }
             </div>
             {this.isBookToc() && ! this.props.compare ? 
-            <NavSidebar modules={sidebarModules} /> : null}
+            <NavSidebar sidebarModules={sidebarModules} /> : null}
           </div>
         </div>
       </div>
diff --git a/static/js/CalendarsPage.jsx b/static/js/CalendarsPage.jsx
index 22f1c4e9e8..f8cf17616c 100644
--- a/static/js/CalendarsPage.jsx
+++ b/static/js/CalendarsPage.jsx
@@ -6,7 +6,7 @@ import React, { useState } from 'react';
 import classNames  from 'classnames';
 import Sefaria  from './sefaria/sefaria';
 import $  from './sefaria/sefariaJquery';
-import { NavSidebar, Modules }from './NavSidebar';
+import { NavSidebar, SidebarModules }from './NavSidebar';
 import Component from 'react-class';
 
 
@@ -27,7 +27,7 @@ const CalendarsPage = ({multiPanel, initialWidth}) => {
   const weeklyListings  = makeListings(weeklyCalendars);
 
   const about = multiPanel ? null :
-    <Modules type={"AboutLearningSchedules"} />
+    <SidebarModules type={"AboutLearningSchedules"} />
 
   const sidebarModules = [
     multiPanel ? {type: "AboutLearningSchedules"} : {type: null},
@@ -55,7 +55,7 @@ const CalendarsPage = ({multiPanel, initialWidth}) => {
               <ResponsiveNBox content={weeklyListings} initialWidth={initialWidth} />
             </div>
           </div>
-          <NavSidebar modules={sidebarModules} />
+          <NavSidebar sidebarModules={sidebarModules} />
         </div>
       </div>
     </div>
diff --git a/static/js/CollectionPage.jsx b/static/js/CollectionPage.jsx
index 692b6c8717..95be1db8a4 100644
--- a/static/js/CollectionPage.jsx
+++ b/static/js/CollectionPage.jsx
@@ -14,12 +14,12 @@ import {
   InterfaceText,
   LanguageToggleButton,
   LoadingMessage,
-  ProfilePic,
   ResponsiveNBox,
   SheetListing,
   TabView,
   TwoOrThreeBox,
 } from './Misc';
+import {ProfilePic} from "./ProfilePic";
 import {ContentText} from "./ContentText";
 
 
@@ -293,7 +293,7 @@ class CollectionPage extends Component {
             <div className="contentInner">
               {content}
             </div>
-            <NavSidebar modules={sidebarModules} />
+            <NavSidebar sidebarModules={sidebarModules} />
           </div>
         </div>
       </div>
diff --git a/static/js/CommunityPage.jsx b/static/js/CommunityPage.jsx
index d182a8d89d..7107f46da6 100644
--- a/static/js/CommunityPage.jsx
+++ b/static/js/CommunityPage.jsx
@@ -4,7 +4,7 @@ import $ from './sefaria/sefariaJquery';
 import Sefaria from './sefaria/sefaria';
 import PropTypes from 'prop-types';
 import classNames  from 'classnames';
-import { NavSidebar, Modules } from './NavSidebar';
+import { NavSidebar, SidebarModules } from './NavSidebar';
 import {
   InterfaceText,
   LoadingMessage,
@@ -59,7 +59,7 @@ const CommunityPage = ({multiPanel, toggleSignUpModal, initialWidth}) => {
             <RecentlyPublished multiPanel={multiPanel} toggleSignUpModal={toggleSignUpModal} />
 
           </div>
-          <NavSidebar modules={sidebarModules} />
+          <NavSidebar sidebarModules={sidebarModules} />
         </div>
       </div>
     </div>
diff --git a/static/js/ConnectionsPanel.jsx b/static/js/ConnectionsPanel.jsx
index dad1bad094..4d43f32256 100644
--- a/static/js/ConnectionsPanel.jsx
+++ b/static/js/ConnectionsPanel.jsx
@@ -8,7 +8,6 @@ import {
   SheetListing,
   Note,
   FeedbackBox,
-  ProfilePic,
   DivineNameReplacer,
   ToolTipped, InterfaceText, EnglishText, HebrewText,
 } from './Misc';
diff --git a/static/js/Editor.jsx b/static/js/Editor.jsx
index 3c41665880..3aca71f1c4 100644
--- a/static/js/Editor.jsx
+++ b/static/js/Editor.jsx
@@ -13,10 +13,10 @@ import {
     SheetAuthorStatement,
     SheetTitle,
     CollectionStatement,
-    ProfilePic,
     InterfaceText,
     Autocompleter,
 } from './Misc';
+import {ProfilePic} from "./ProfilePic";
 
 import classNames from 'classnames';
 import $ from "./sefaria/sefariaJquery";
diff --git a/static/js/Header.jsx b/static/js/Header.jsx
index 94ab61ae02..53ea388954 100644
--- a/static/js/Header.jsx
+++ b/static/js/Header.jsx
@@ -8,12 +8,12 @@ import Sefaria  from './sefaria/sefaria';
 import {
   SearchButton,
   GlobalWarningMessage,
-  ProfilePic,
   InterfaceLanguageMenu,
   InterfaceText,
   LanguageToggleButton,
   DonateLink
 } from './Misc';
+import {ProfilePic} from "./ProfilePic";
 import {Autocomplete} from './Autocomplete'
 import { DropdownMenu, DropdownMenuSeparator, DropdownMenuItem, DropdownMenuItemWithIcon } from './common/DropdownMenu';
 
diff --git a/static/js/ImageCropper.jsx b/static/js/ImageCropper.jsx
new file mode 100644
index 0000000000..de752ea11e
--- /dev/null
+++ b/static/js/ImageCropper.jsx
@@ -0,0 +1,117 @@
+import React, {useState, useRef} from 'react';
+import Sefaria from './sefaria/sefaria';
+import ReactCrop from 'react-image-crop';
+import {LoadingRing} from "./Misc";
+import 'react-image-crop/dist/ReactCrop.css';
+
+export const ImageCropper = ({loading, error, src, onClose, onSave}) => {
+    const imageRef = useRef(null);
+    const [isFirstCropChange, setIsFirstCropChange] = useState(true);
+    const [crop, setCrop] = useState({unit: "px", width: 250, aspect: 1});
+    const [croppedImageBlob, setCroppedImageBlob] = useState(null);
+    const onImageLoaded = (image) => {imageRef.current = image};
+    const onCropComplete = (crop) => {
+        makeClientCrop(crop);
+    }
+    const onCropChange = (crop, percentCrop) => {
+        if (isFirstCropChange) {
+            const { clientWidth:width, clientHeight:height } = imageRef.current;
+            crop.width = Math.min(width, height);
+            crop.height = crop.width;
+            crop.x = (imageRef.current.width/2) - (crop.width/2);
+            crop.y = (imageRef.current.height/2) - (crop.width/2);
+            setCrop(crop);
+            setIsFirstCropChange(false);
+        } else {
+            setCrop(crop);
+        }
+    }
+    const makeClientCrop = async (crop) => {
+        if (imageRef.current && crop.width && crop.height) {
+            const croppedImageBlob = await getCroppedImg(
+                imageRef.current,
+                crop,
+                "newFile.jpeg"
+            );
+            setCroppedImageBlob(croppedImageBlob);
+        }
+    }
+    const getCroppedImg = (image, crop, fileName) => {
+        const canvas = document.createElement("canvas");
+        const scaleX = image.naturalWidth / image.width;
+        const scaleY = image.naturalHeight / image.height;
+        canvas.width = crop.width * scaleX;
+        canvas.height = crop.height * scaleY;
+        const ctx = canvas.getContext("2d");
+        ctx.drawImage(
+            image,
+            crop.x * scaleX,
+            crop.y * scaleY,
+            crop.width * scaleX,
+            crop.height * scaleY,
+            0,
+            0,
+            crop.width * scaleX,
+            crop.height * scaleY
+        );
+
+        return new Promise((resolve, reject) => {
+            canvas.toBlob(blob => {
+                if (!blob) {
+                    console.error("Canvas is empty");
+                    return;
+                }
+                blob.name = fileName;
+                resolve(blob);
+            }, "image/jpeg");
+        });
+    }
+    const closePopup = () => {
+        setCrop({unit: "px", width: 250, aspect: 1});
+        setIsFirstCropChange(true);
+        setCroppedImageBlob(null);
+        onClose();
+    }
+    return (<>
+        { (src || !!error) && (
+            <div id="interruptingMessageBox" className="sefariaModalBox">
+                <div id="interruptingMessageOverlay" onClick={closePopup}></div>
+                <div id="interruptingMessage" className="profile-pic-cropper-modal">
+                    <div className="sefariaModalContent profile-pic-cropper-modal-inner">
+                        { src ?
+                            (<ReactCrop
+                                src={src}
+                                crop={crop}
+                                className="profile-pic-cropper"
+                                keepSelection
+                                onImageLoaded={onImageLoaded}
+                                onComplete={onCropComplete}
+                                onChange={onCropChange}
+                            />) : (<div className="profile-pic-cropper-error">{ error }</div>)
+                        }
+                    </div>
+                    { (loading || isFirstCropChange) ? (<div className="profile-pic-loading"><LoadingRing /></div>) : (
+                        <div>
+                            <div className="smallText profile-pic-cropper-desc">
+                                <span className="int-en">Drag corners to crop image</span>
+                                <span className="int-he">לחיתוך התמונה, גרור את הפינות</span>
+                            </div>
+                            <div className="profile-pic-cropper-button-row">
+                                <a href="#" className="resourcesLink profile-pic-cropper-button" onClick={closePopup}>
+                                    <span className="int-en">Cancel</span>
+                                    <span className="int-he">בטל</span>
+                                </a>
+                                <a href="#" className="resourcesLink blue profile-pic-cropper-button" onClick={()=>onSave(croppedImageBlob)}>
+                                    <span className="int-en">Save</span>
+                                    <span className="int-he">שמור</span>
+                                </a>
+                            </div>
+                        </div>
+                    )
+                    }
+                </div>
+            </div>
+        )
+        }
+    </>);
+};
diff --git a/static/js/Misc.jsx b/static/js/Misc.jsx
index 5de3c35a18..8afefefd18 100644
--- a/static/js/Misc.jsx
+++ b/static/js/Misc.jsx
@@ -9,11 +9,10 @@ import PropTypes from 'prop-types';
 import Component from 'react-class';
 import { usePaginatedDisplay } from './Hooks';
 import {ContentLanguageContext, AdContext, StrapiDataContext} from './context';
-import ReactCrop from 'react-image-crop';
-import 'react-image-crop/dist/ReactCrop.css';
 import {ContentText} from "./ContentText";
 import ReactTags from "react-tag-autocomplete";
 import {AdminEditorButton, useEditToggle} from "./AdminEditor";
+import {ProfilePic} from "./ProfilePic";
 import {CategoryEditor, ReorderEditor} from "./CategoryEditor";
 import {refSort} from "./TopicPage";
 import {TopicEditor} from "./TopicEditor";
@@ -143,226 +142,6 @@ const DonateLink = ({children, classes, source, link}) => {
   );
 };
 
-/* flexible profile picture that overrides the default image of gravatar with text with the user's initials */
-class ProfilePic extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      showDefault: !this.props.url || this.props.url.startsWith("https://www.gravatar"), // We can't know in advance if a gravatar image exists of not, so start with the default beforing trying to load image
-      src: null,
-      isFirstCropChange: true,
-      crop: {unit: "px", width: 250, aspect: 1},
-      croppedImageBlob: null,
-      error: null,
-    };
-    this.imgFile = React.createRef();
-  }
-  setShowDefault() { /* console.log("error"); */ this.setState({showDefault: true});  }
-  setShowImage() { /* console.log("load"); */ this.setState({showDefault: false});  }
-  componentDidMount() {
-    if (this.didImageLoad()) {
-      this.setShowImage();
-    } else {
-      this.setShowDefault();
-    }
-  }
-  didImageLoad(){
-    // When using React Hydrate, the onLoad event of the profile image will return before
-    // react code runs, so we check after mount as well to look replace bad images, or to
-    // swap in a gravatar image that we now know is valid.
-    const img = this.imgFile.current;
-    return (img && img.complete && img.naturalWidth !== 0);
-  }
-  onSelectFile(e) {
-    if (e.target.files && e.target.files.length > 0) {
-      if (!e.target.files[0].type.startsWith('image/')) {
-        this.setState({ error: "Error: Please upload an image with the correct file extension (e.g. jpg, png)"});
-        return;
-      }
-      const reader = new FileReader();
-      reader.addEventListener("load", () =>
-        this.setState({ src: reader.result })
-      );
-      console.log("FILE", e.target.files[0]);
-      reader.readAsDataURL(e.target.files[0]);
-    }
-  }
-  onImageLoaded(image) {
-    this.imageRef = image;
-  }
-  onCropComplete(crop) {
-    this.makeClientCrop(crop);
-  }
-  onCropChange(crop, percentCrop) {
-    // You could also use percentCrop:
-    // this.setState({ crop: percentCrop });
-    if (this.state.isFirstCropChange) {
-      const { clientWidth:width, clientHeight:height } = this.imageRef;
-      crop.width = Math.min(width, height);
-      crop.height = crop.width;
-      crop.x = (this.imageRef.width/2) - (crop.width/2);
-      crop.y = (this.imageRef.height/2) - (crop.width/2);
-      this.setState({ crop, isFirstCropChange: false });
-    } else {
-      this.setState({ crop });
-    }
-  }
-  async makeClientCrop(crop) {
-    if (this.imageRef && crop.width && crop.height) {
-      const croppedImageBlob = await this.getCroppedImg(
-        this.imageRef,
-        crop,
-        "newFile.jpeg"
-      );
-      //console.log(croppedImageUrl);
-      this.setState({ croppedImageBlob });
-    }
-  }
-  getCroppedImg(image, crop, fileName) {
-    const canvas = document.createElement("canvas");
-    const scaleX = image.naturalWidth / image.width;
-    const scaleY = image.naturalHeight / image.height;
-    canvas.width = crop.width * scaleX;
-    canvas.height = crop.height * scaleY;
-    const ctx = canvas.getContext("2d");
-    ctx.drawImage(
-      image,
-      crop.x * scaleX,
-      crop.y * scaleY,
-      crop.width * scaleX,
-      crop.height * scaleY,
-      0,
-      0,
-      crop.width * scaleX,
-      crop.height * scaleY
-    );
-
-    return new Promise((resolve, reject) => {
-      canvas.toBlob(blob => {
-        if (!blob) {
-          console.error("Canvas is empty");
-          return;
-        }
-        blob.name = fileName;
-        resolve(blob);
-      }, "image/jpeg");
-    });
-  }
-  closePopup({ cb }) {
-    this.setState({
-      src: null,
-      crop: {unit: "px", width: 250, aspect: 1},
-      isFirstCropChange: true,
-      croppedImageBlob: null,
-      error: null,
-    }, cb);
-  }
-  async upload() {
-    const formData = new FormData();
-    formData.append('file', this.state.croppedImageBlob);
-    this.setState({ uploading: true });
-    let errored = false;
-    try {
-      const response = await Sefaria.uploadProfilePhoto(formData);
-      if (response.error) {
-        throw new Error(response.error);
-      } else {
-        this.closePopup({ cb: () => {
-          window.location = "/profile/" + Sefaria.slug; // reload to get update
-          return;
-        }});
-      }
-    } catch (e) {
-      errored = true;
-      console.log(e);
-    }
-    this.setState({ uploading: false, errored });
-  }
-  render() {
-    const { name, url, len, hideOnDefault, showButtons, outerStyle } = this.props;
-    const { showDefault, src, crop, error, uploading, isFirstCropChange } = this.state;
-    const nameArray = !!name.trim() ? name.trim().split(/\s/) : [];
-    const initials = nameArray.length > 0 ? (nameArray.length === 1 ? nameArray[0][0] : nameArray[0][0] + nameArray[nameArray.length-1][0]) : "";
-    const defaultViz = showDefault ? 'flex' : 'none';
-    const profileViz = showDefault ? 'none' : 'block';
-    const imageSrc = url.replace("profile-default.png", 'profile-default-404.png');  // replace default with non-existant image to force onLoad to fail
-
-    return (
-      <div style={outerStyle} className="profile-pic">
-        <div className={classNames({'default-profile-img': 1, noselect: 1, invisible: hideOnDefault})}
-          style={{display: defaultViz,  width: len, height: len, fontSize: len/2}}>
-          { showButtons ? null : `${initials}` }
-        </div>
-        <img
-          className="img-circle profile-img"
-          style={{display: profileViz, width: len, height: len, fontSize: len/2}}
-          src={imageSrc}
-          alt="User Profile Picture"
-          ref={this.imgFile}
-          onLoad={this.setShowImage}
-          onError={this.setShowDefault}
-        />
-        {this.props.children ? this.props.children : null /*required for slate.js*/}
-        { showButtons ? /* cant style file input directly. see: https://stackoverflow.com/questions/572768/styling-an-input-type-file-button */
-            (<div className={classNames({"profile-pic-button-visible": showDefault !== null, "profile-pic-hover-button": !showDefault, "profile-pic-button": 1})}>
-              <input type="file" className="profile-pic-input-file" id="profile-pic-input-file" onChange={this.onSelectFile} onClick={(event)=> { event.target.value = null}}/>
-              <label htmlFor="profile-pic-input-file" className={classNames({resourcesLink: 1, blue: showDefault})}>
-                <span className="int-en">{ showDefault ? "Add Picture" : "Upload New" }</span>
-                <span className="int-he">{ showDefault ? "הוספת תמונה" : "עדכון תמונה" }</span>
-              </label>
-            </div>) : null
-          }
-          { (src || !!error) && (
-            <div id="interruptingMessageBox" className="sefariaModalBox">
-              <div id="interruptingMessageOverlay" onClick={this.closePopup}></div>
-              <div id="interruptingMessage" className="profile-pic-cropper-modal">
-                <div className="sefariaModalContent profile-pic-cropper-modal-inner">
-                  { src ?
-                    (<ReactCrop
-                      src={src}
-                      crop={crop}
-                      className="profile-pic-cropper"
-                      keepSelection
-                      onImageLoaded={this.onImageLoaded}
-                      onComplete={this.onCropComplete}
-                      onChange={this.onCropChange}
-                    />) : (<div className="profile-pic-cropper-error">{ error }</div>)
-                  }
-              </div>
-              { (uploading || isFirstCropChange) ? (<div className="profile-pic-loading"><LoadingRing /></div>) : (
-                <div>
-                  <div className="smallText profile-pic-cropper-desc">
-                    <span className="int-en">Drag corners to crop image</span>
-                    <span className="int-he">לחיתוך התמונה, גרור את הפינות</span>
-                  </div>
-                  <div className="profile-pic-cropper-button-row">
-                    <a href="#" className="resourcesLink profile-pic-cropper-button" onClick={this.closePopup}>
-                      <span className="int-en">Cancel</span>
-                      <span className="int-he">בטל</span>
-                    </a>
-                    <a href="#" className="resourcesLink blue profile-pic-cropper-button" onClick={this.upload}>
-                      <span className="int-en">Save</span>
-                      <span className="int-he">שמור</span>
-                    </a>
-                  </div>
-                </div>
-                )
-              }
-            </div>
-          </div>
-          )
-        }
-      </div>
-    );
-  }
-}
-ProfilePic.propTypes = {
-  url:           PropTypes.string,
-  name:          PropTypes.string,
-  len:           PropTypes.number,
-  hideOnDefault: PropTypes.bool,  // hide profile pic if you have are displaying default pic
-  showButtons:   PropTypes.bool,  // show profile pic action buttons
-};
 
 
 /**
@@ -3112,23 +2891,13 @@ const TitleVariants = function({titles, update, options}) {
                   />
          </div>
 }
-const SheetMetaDataBox = ({title, summary, authorUrl, authorStatement, authorImage, sheetOptions, editable}) => {
+const SheetMetaDataBox = ({title, summary, sheetOptions, editable}) => {
   return <div className="sheetMetaDataBox">
     <div className="sidebarLayout">
       <SheetMetaDataBoxSegment text={title} className="title" editable={editable}/>
       {sheetOptions}
     </div>
     {summary && <SheetMetaDataBoxSegment text={summary} className="summary" editable={editable}/>}
-    <div className="user">
-      <ProfilePic
-          url={authorImage}
-          len={30}
-          name={authorStatement}
-      />
-      <a href={authorUrl} className="sheetAuthorName">
-        <InterfaceText>{authorStatement}</InterfaceText>
-      </a>
-    </div>
   </div>
 }
 
@@ -3554,7 +3323,6 @@ export {
   NBox,
   Note,
   ProfileListing,
-  ProfilePic,
   ReaderMessage,
   CloseButton,
   DisplaySettingsButton,
diff --git a/static/js/NavSidebar.jsx b/static/js/NavSidebar.jsx
index 0ac6e78cbe..f2542127ca 100644
--- a/static/js/NavSidebar.jsx
+++ b/static/js/NavSidebar.jsx
@@ -8,23 +8,20 @@ import { Promotions } from './Promotions'
 import {SignUpModalKind} from "./sefaria/signupModalContent";
 import Button from "./common/Button";
 
-const NavSidebar = ({modules}) => {
-  return (
-    <div className="navSidebar sans-serif">
-    {modules.map((m, i) =>
-      <Modules
+const NavSidebar = ({sidebarModules}) => {
+  return <div className="navSidebar sans-serif">
+    {sidebarModules.map((m, i) =>
+      <SidebarModules
         type={m.type}
         props={m.props || {}}
         key={i} />
     )}
     <SidebarFooter />
   </div>
-
-  )
 };
 
 
-const Modules = ({type, props}) => {
+const SidebarModules = ({type, props}) => {
   // Choose the appropriate module component to render by `type`
   const moduleTypes = {
     "AboutSefaria":           AboutSefaria,
@@ -65,18 +62,18 @@ const Modules = ({type, props}) => {
     "StudyCompanion":        StudyCompanion,
   };
   if (!type) { return null; }
-  const ModuleType = moduleTypes[type];
-  return <ModuleType {...props} />
+  const SidebarModuleType = moduleTypes[type];
+  return <SidebarModuleType {...props} />
 };
 
 
-const Module = ({children, blue, wide}) => {
+const SidebarModule = ({children, blue, wide}) => {
   const classes = classNames({navSidebarModule: 1, "sans-serif": 1, blue, wide});
   return <div className={classes}>{children}</div>
 };
 
 
-const ModuleTitle = ({children, en, he}) => {
+const SidebarModuleTitle = ({children, en, he}) => {
   const content = children ?
     <InterfaceText>{children}</InterfaceText>
     : <InterfaceText text={{en, he}} />;
@@ -84,11 +81,11 @@ const ModuleTitle = ({children, en, he}) => {
 };
 
 const TitledText = ({children, title, text}) => {
-  return <Module>
-            <ModuleTitle en={title.en} he={title.he}/>
+  return <SidebarModule>
+            <SidebarModuleTitle en={title.en} he={title.he}/>
             <InterfaceText markdown={{en: text.en, he: text.he}} />
             {children}
-        </Module>
+        </SidebarModule>
 };
 const RecentlyViewedItem = ({oref}) => {
    const trackItem = () => {
@@ -138,27 +135,27 @@ const RecentlyViewed = ({toggleSignUpModal, mobile}) => {
    }
    const allHistoryPhrase = mobile ? "All History" : "All history ";
    const recentlyViewedList = <RecentlyViewedList items={recentlyViewedItems}/>;
-   return <Module>
+   return <SidebarModule>
             <div className="recentlyViewed">
                 <div id="header">
-                  <ModuleTitle>Recently Viewed</ModuleTitle>
+                  <SidebarModuleTitle>Recently Viewed</SidebarModuleTitle>
                   {!mobile && recentlyViewedList}
                   <a href="/texts/history" id="history" onClick={handleAllHistory}><InterfaceText>{allHistoryPhrase}</InterfaceText></a>
                 </div>
                 {mobile && recentlyViewedList}
             </div>
-          </Module>;
+          </SidebarModule>;
 }
 
 const Promo = () =>
-    <Module>
+    <SidebarModule>
         <Promotions adType="sidebar"/>
-    </Module>
+    </SidebarModule>
 ;
 
 const StudyCompanion = () => (
-    <Module>
-        <ModuleTitle>Study Companion</ModuleTitle>
+    <SidebarModule>
+        <SidebarModuleTitle>Study Companion</SidebarModuleTitle>
         <div><InterfaceText>Get the Weekly Parashah Study Companion in your inbox.</InterfaceText></div>
         <a className="button small"
            data-anl-event="select_promotion:click|view_promotion:scrollIntoView"
@@ -167,14 +164,14 @@ const StudyCompanion = () => (
             <img src="/static/icons/email-newsletter.svg" alt="Sign up for our weekly parashah study companion"/>
             <InterfaceText>Sign Up</InterfaceText>
         </a>
-    </Module>
+    </SidebarModule>
 )
 
 
 const AboutSefaria = ({hideTitle}) => (
-  <Module>
+  <SidebarModule>
     {!hideTitle ?
-    <ModuleTitle>A Living Library of Torah</ModuleTitle> : null }
+    <SidebarModuleTitle>A Living Library of Torah</SidebarModuleTitle> : null }
     <InterfaceText>
       <EnglishText>
           Sefaria is home to 3,000 years of Jewish texts. We are a nonprofit organization offering free access to texts, translations,
@@ -211,7 +208,7 @@ const AboutSefaria = ({hideTitle}) => (
           </HebrewText>
       </InterfaceText>
     }
-  </Module>
+  </SidebarModule>
 );
 
 
@@ -232,9 +229,9 @@ const AboutTranslatedText = ({translationsSlug}) => {
     "yi": {title: "א לעבעדיקע ביבליאטעק פון תורה", body: "אין ספֿריאַ איז אַ היים פֿון 3,000 יאָר ייִדישע טעקסטן. מיר זענען אַ נאַן-נוץ אָרגאַניזאַציע וואָס אָפפערס פריי אַקסעס צו טעקסטן, איבערזעצונגען און קאָמענטאַרן אַזוי אַז אַלעמען קענען אָנטייל נעמען אין די אָנגאָינג פּראָצעס פון לערנען, ינטערפּריטיישאַן און שאפן תורה."}
   }
   return (
-  <Module>
-    <ModuleTitle>{translationLookup[translationsSlug] ?
-          translationLookup[translationsSlug]["title"] : "A Living Library of Torah"}</ModuleTitle>
+  <SidebarModule>
+    <SidebarModuleTitle>{translationLookup[translationsSlug] ?
+          translationLookup[translationsSlug]["title"] : "A Living Library of Torah"}</SidebarModuleTitle>
         { translationLookup[translationsSlug] ?
           translationLookup[translationsSlug]["body"] :
           <InterfaceText>
@@ -249,13 +246,13 @@ const AboutTranslatedText = ({translationsSlug}) => {
         </HebrewText>
         </InterfaceText>
         }
-  </Module>
+  </SidebarModule>
 );
 }
 
 
 const Resources = () => (
-  <Module>
+  <SidebarModule>
     <h3><InterfaceText context="ResourcesModule">Resources</InterfaceText></h3>
     <div className="linkList">
       <IconLink text="Mobile Apps" url="/mobile" icon="mobile.svg" />
@@ -264,7 +261,7 @@ const Resources = () => (
       <IconLink text="Torah Tab" url="/torah-tab" icon="torah-tab.svg" />
       <IconLink text="Help" url="/help" icon="help.svg" />
     </div>
-  </Module>
+  </SidebarModule>
 );
 
 const getSidebarFooterData = () => [{'he': 'אודות','en': 'About', 'url': 'www.example.com'}, 
@@ -301,37 +298,37 @@ const SidebarFooter = () => {
 
 
 const TheJewishLibrary = ({hideTitle}) => (
-  <Module>
+  <SidebarModule>
     {!hideTitle ?
-    <ModuleTitle>The Jewish Library</ModuleTitle> : null}
+    <SidebarModuleTitle>The Jewish Library</SidebarModuleTitle> : null}
     <InterfaceText>The tradition of Torah texts is a vast, interconnected network that forms a conversation across space and time. The five books of the Torah form its foundation, and each generation of later texts functions as a commentary on those that came before it.</InterfaceText>
-  </Module>
+  </SidebarModule>
 );
 
 
 const SupportSefaria = ({blue}) => (
-  <Module blue={blue}>
-    <ModuleTitle>Support Sefaria</ModuleTitle>
+  <SidebarModule blue={blue}>
+    <SidebarModuleTitle>Support Sefaria</SidebarModuleTitle>
     <InterfaceText>Sefaria is an open source, nonprofit project. Support us by making a tax-deductible donation.</InterfaceText>
     <br />
     <DonateLink classes={"button small" + (blue ? " white" : "")} source={"NavSidebar-SupportSefaria"}>
       <img src="/static/img/heart.png" alt="donation icon" />
       <InterfaceText>Make a Donation</InterfaceText>
     </DonateLink>
-  </Module>
+  </SidebarModule>
 );
 
 
 const SponsorADay = () => (
-  <Module>
-    <ModuleTitle>Sponsor A Day of Learning</ModuleTitle>
+  <SidebarModule>
+    <SidebarModuleTitle>Sponsor A Day of Learning</SidebarModuleTitle>
     <InterfaceText>With your help, we can add more texts and translations to the library, develop new tools for learning, and keep Sefaria accessible for Torah study anytime, anywhere.</InterfaceText>
     <br />
     <DonateLink classes={"button small"} link={"dayOfLearning"} source={"NavSidebar-SponsorADay"}>
       <img src="/static/img/heart.png" alt="donation icon" />
       <InterfaceText>Sponsor A Day</InterfaceText>
     </DonateLink>
-  </Module>
+  </SidebarModule>
 );
 
 
@@ -346,10 +343,10 @@ const AboutTextCategory = ({cats}) => {
   }
 
   return (
-    <Module>
+    <SidebarModule>
       <ModuleTitle><InterfaceText text={{en: enTitle, he: heTitle}} /></ModuleTitle>
       <InterfaceText markdown={{en: tocObject.enDesc, he: tocObject.heDesc}} />
-    </Module>
+    </SidebarModule>
   );
 };
 
@@ -375,9 +372,9 @@ const AboutText = ({index, hideTitle}) => {
   if (!authors.length && !composed && !description) { return null; }
 
   return (
-    <Module>
+    <SidebarModule>
       {hideTitle ? null :
-          <ModuleTitle>About This Text</ModuleTitle>}
+          <SidebarModuleTitle>About This Text</SidebarModuleTitle>}
       { composed || authors.length ?
       <div className="aboutTextMetadata">
 
@@ -403,7 +400,7 @@ const AboutText = ({index, hideTitle}) => {
       {description ?
       <InterfaceText markdown={{en: enDesc, he: heDesc}}/> : null}
 
-    </Module>
+    </SidebarModule>
   );
 };
 
@@ -463,8 +460,8 @@ const DafLink = () => {
 }
 
 const Translations = () => {
-  return (<Module>
-    <ModuleTitle>Translations</ModuleTitle>
+  return (<SidebarModule>
+    <SidebarModuleTitle>Translations</SidebarModuleTitle>
     <InterfaceText>
       <EnglishText>
         Access key works from the library in several languages.
@@ -474,14 +471,14 @@ const Translations = () => {
       </HebrewText>
     </InterfaceText>
     <TranslationLinks />
-  </Module>)
+  </SidebarModule>)
 }
 
 
 const LearningSchedules = () => {
   return (
-    <Module>
-      <ModuleTitle>Learning Schedules</ModuleTitle>
+    <SidebarModule>
+      <SidebarModuleTitle>Learning Schedules</SidebarModuleTitle>
       <div className="readingsSection">
         <span className="readingsSectionTitle">
           <InterfaceText>Weekly Torah Portion</InterfaceText>: <ParashahName />
@@ -506,15 +503,15 @@ const LearningSchedules = () => {
         <HebrewText>לוחות לימוד נוספים ›</HebrewText>
         </InterfaceText>
       </a>
-    </Module>
+    </SidebarModule>
   );
 };
 
 
 const WeeklyTorahPortion = () => {
   return (
-    <Module>
-      <ModuleTitle>Weekly Torah Portion</ModuleTitle>
+    <SidebarModule>
+      <SidebarModuleTitle>Weekly Torah Portion</SidebarModuleTitle>
       <div className="readingsSection">
         <span className="readingsSectionTitle">
           <ParashahName />
@@ -533,22 +530,22 @@ const WeeklyTorahPortion = () => {
         <HebrewText>פרשות השבוע ›</HebrewText>
         </InterfaceText>
       </a>
-    </Module>
+    </SidebarModule>
   );
 };
 
 
 const DafYomi = () => {
   return (
-    <Module>
-      <ModuleTitle>Daily Learning</ModuleTitle>
+    <SidebarModule>
+      <SidebarModuleTitle>Daily Learning</SidebarModuleTitle>
       <div className="readingsSection">
         <span className="readingsSectionTitle">
           <InterfaceText >Daf Yomi</InterfaceText>
         </span>
         <DafLink />
       </div>
-    </Module>
+    </SidebarModule>
   );
 };
 
@@ -583,8 +580,8 @@ const Visualizations = ({categories}) => {
   if (links.length == 0) { return null; }
 
   return (
-    <Module>
-      <ModuleTitle>Visualizations</ModuleTitle>
+    <SidebarModule>
+      <SidebarModuleTitle>Visualizations</SidebarModuleTitle>
       <InterfaceText>Explore interconnections among texts with our interactive visualizations.</InterfaceText>
       <div className="linkList">
         {links.map((link, i) =>
@@ -600,15 +597,15 @@ const Visualizations = ({categories}) => {
         <HebrewText>תרשימים גרפיים נוספים ›</HebrewText>
         </InterfaceText>
       </a>
-    </Module>
+    </SidebarModule>
   );
 };
 
 
 const AboutTopics = ({hideTitle}) => (
-  <Module>
+  <SidebarModule>
     {hideTitle ? null :
-    <ModuleTitle>About Topics</ModuleTitle> }
+    <SidebarModuleTitle>About Topics</SidebarModuleTitle> }
     <InterfaceText>
         <HebrewText>
 דפי הנושא מציגים מקורות נבחרים מארון הספרים היהודי עבור אלפי נושאים. ניתן לדפדף לפי קטגוריה או לחפש לפי נושא ספציפי, ובסרגל הצד מוצגים הנושאים הפופולריים ביותר ואלה הקשורים אליהם.  הקליקו ושוטטו בין הנושאים השונים כדי ללמוד עוד.
@@ -617,19 +614,19 @@ const AboutTopics = ({hideTitle}) => (
         Topics Pages present a curated selection of various genres of sources on thousands of chosen subjects. You can browse by category, search for something specific, or view the most popular topics — and related topics — on the sidebar. Explore and click through to learn more.
         </EnglishText>
     </InterfaceText>
-  </Module>
+  </SidebarModule>
 );
 
 
 const TrendingTopics = () => (
-  <Module>
-    <ModuleTitle>Trending Topics</ModuleTitle>
+  <SidebarModule>
+    <SidebarModuleTitle>Trending Topics</SidebarModuleTitle>
     {Sefaria.trendingTopics.map((topic, i) =>
       <div className="navSidebarLink ref serif" key={i}>
         <a href={"/topics/" + topic.slug}><InterfaceText text={{en: topic.en, he: topic.he}}/></a>
       </div>
     )}
-  </Module>
+  </SidebarModule>
 );
 
 
@@ -642,8 +639,8 @@ const RelatedTopics = ({title}) => {
         Sefaria.getIndexDetails(title).then(data => setTopics(data.relatedTopics));
   },[title]);
   return (topics.length ?
-    <Module>
-      <ModuleTitle>Related Topics</ModuleTitle>
+    <SidebarModule>
+      <SidebarModuleTitle>Related Topics</SidebarModuleTitle>
       {shownTopics.map((topic, i) =>
         <div className="navSidebarLink ref serif" key={i}>
           <a href={"/topics/" + topic.slug}><InterfaceText text={{en: topic.title.en, he: topic.title.he}}/></a>
@@ -653,15 +650,15 @@ const RelatedTopics = ({title}) => {
       <a className="moreLink" onClick={()=>{setShowMore(true);}}>
         <InterfaceText>More</InterfaceText>
       </a> : null}
-    </Module> : null
+    </SidebarModule> : null
   );
 };
 
 const JoinTheCommunity = ({wide}) => {
   return (
-    <Module wide={wide}>
+    <SidebarModule wide={wide}>
       <div>
-        <ModuleTitle>Join the Conversation</ModuleTitle>
+        <SidebarModuleTitle>Join the Conversation</SidebarModuleTitle>
         <InterfaceText>People around the world use Sefaria to create and share Torah resources. You're invited to add your voice.</InterfaceText>
       </div>
       <div>
@@ -670,14 +667,14 @@ const JoinTheCommunity = ({wide}) => {
           <InterfaceText>Explore the Community</InterfaceText>
         </a>
       </div>
-    </Module>
+    </SidebarModule>
   );
 };
 
 
 const GetTheApp = () => (
-  <Module>
-    <ModuleTitle>Get the Mobile App</ModuleTitle>
+  <SidebarModule>
+    <SidebarModuleTitle>Get the Mobile App</SidebarModuleTitle>
     <InterfaceText>Access the Jewish library anywhere and anytime with the</InterfaceText> <a href="/mobile" className="inTextLink"><InterfaceText>Sefaria mobile app.</InterfaceText></a>
     <br />
     <AppStoreButton
@@ -690,7 +687,7 @@ const GetTheApp = () => (
         platform='android'
         altText={Sefaria._("Sefaria app on Android")}
     />
-  </Module>
+  </SidebarModule>
 );
 
 
@@ -698,8 +695,8 @@ const StayConnected = () => { // TODO: remove? looks like we are not using this
   const fbURL = Sefaria.interfaceLang == "hebrew" ? "https://www.facebook.com/sefaria.org.il" : "https://www.facebook.com/sefaria.org";
 
   return (
-    <Module>
-      <ModuleTitle>Stay Connected</ModuleTitle>
+    <SidebarModule>
+      <SidebarModuleTitle>Stay Connected</SidebarModuleTitle>
       <InterfaceText>Get updates on new texts, learning resources, features, and more.</InterfaceText>
       <br />
       <NewsletterSignUpForm context="sidebar" />
@@ -714,7 +711,7 @@ const StayConnected = () => { // TODO: remove? looks like we are not using this
         <img src="/static/icons/youtube.svg" alt={Sefaria._("Sefaria on YouTube")} />
       </a>
 
-    </Module>
+    </SidebarModule>
   );
 };
 
@@ -742,8 +739,8 @@ const WhatIsASourceSheet = () => (
     </TitledText>
 );
 const AboutLearningSchedules = () => (
-  <Module>
-    <ModuleTitle>Learning Schedules</ModuleTitle>
+  <SidebarModule>
+    <SidebarModuleTitle>Learning Schedules</SidebarModuleTitle>
     <InterfaceText>
         <EnglishText>
             Since biblical times, the Torah has been divided into sections which are read each week on a set yearly calendar.
@@ -754,14 +751,14 @@ const AboutLearningSchedules = () => (
             בעקבות המנהג הזה התפתחו לאורך השנים סדרי לימוד תקופתיים רבים נוספים, ובעזרתם יכולות קהילות וקבוצות של לומדים ללמוד יחד טקסטים שלמים.
         </HebrewText>
     </InterfaceText>
-  </Module>
+  </SidebarModule>
 );
 
 
 const AboutCollections = ({hideTitle}) => (
-  <Module>
+  <SidebarModule>
     {hideTitle ? null :
-    <ModuleTitle>About Collections</ModuleTitle>}
+    <SidebarModuleTitle>About Collections</SidebarModuleTitle>}
     <InterfaceText>
         <EnglishText>Collections are user generated bundles of sheets which can be used privately, shared with friends, or made public on Sefaria.</EnglishText>
         <HebrewText>אסופות הן מקבצים של דפי מקורות שנוצרו על ידי משתמשי האתר. הן ניתנות לשימוש פרטי, לצורך שיתוף עם אחרים או לשימוש ציבורי באתר ספריא.</HebrewText>
@@ -773,13 +770,13 @@ const AboutCollections = ({hideTitle}) => (
         <InterfaceText>Create a Collection</InterfaceText>
       </a>
     </div>}
-  </Module>
+  </SidebarModule>
 );
 
 
 const ExploreCollections = () => (
-  <Module>
-    <ModuleTitle>Collections</ModuleTitle>
+  <SidebarModule>
+    <SidebarModuleTitle>Collections</SidebarModuleTitle>
     <InterfaceText>Organizations, communities and individuals around the world curate and share collections of sheets for you to explore.</InterfaceText>
     <div>
       <a className="button small white" href="/collections">
@@ -787,31 +784,31 @@ const ExploreCollections = () => (
         <InterfaceText>Explore Collections</InterfaceText>
       </a>
     </div>
-  </Module>
+  </SidebarModule>
 );
 
 
 const WhoToFollow = ({toggleSignUpModal}) => (
-  <Module>
-    <ModuleTitle>Who to Follow</ModuleTitle>
+  <SidebarModule>
+    <SidebarModuleTitle>Who to Follow</SidebarModuleTitle>
     {Sefaria.followRecommendations.map(user =>
     <ProfileListing {...user} key={user.uid} toggleSignUpModal={toggleSignUpModal} />)}
-  </Module>
+  </SidebarModule>
 );
 
 
 const Image = ({url}) => (
-  <Module>
+  <SidebarModule>
     <img className="imageModuleImage" src={url} />
-  </Module>
+  </SidebarModule>
 );
 
 
 const Wrapper = ({title, content}) => (
-  <Module>
-    {title ? <ModuleTitle>{title}</ModuleTitle> : null}
+  <SidebarModule>
+    {title ? <SidebarModuleTitle>{title}</SidebarModuleTitle> : null}
     {content}
-  </Module>
+  </SidebarModule>
 );
 
 
@@ -879,8 +876,8 @@ const DownloadVersions = ({sref}) => {
     }, [sref]);
 
     return(
-        <Module>
-          <ModuleTitle>Download Text</ModuleTitle>
+        <SidebarModule>
+          <SidebarModuleTitle>Download Text</SidebarModuleTitle>
           <div className="downloadTextModule sans-serif">
           <Dropdown
               name="dlVersionName"
@@ -911,51 +908,51 @@ const DownloadVersions = ({sref}) => {
           />
           <a className={`button fillWidth${isReady ? "" : " disabled"}`} onClick={handleClick} href={versionDlLink()} download>{Sefaria._("Download")}</a>
         </div>
-        </Module>
+        </SidebarModule>
     );
 };
 
 
 const PortalAbout = ({title, description, image_uri, image_caption}) => {
     return(
-        <Module>
-            <ModuleTitle en={title.en} he={title.he} />
+        <SidebarModule>
+            <SidebarModuleTitle en={title.en} he={title.he} />
             <div className="portalTopicImageWrapper">
                 <ImageWithCaption photoLink={image_uri} caption={image_caption} />
             </div>
             <InterfaceText markdown={{en: description.en, he: description.he}} />
-        </Module>
+        </SidebarModule>
     )
 };
 
 
 const PortalMobile = ({title, description, android_link, ios_link}) => {
     return(
-        <Module>
+        <SidebarModule>
             <div className="portalMobile">
-                <ModuleTitle en={title.en} he={title.he} />
+                <SidebarModuleTitle en={title.en} he={title.he} />
                 {description && <InterfaceText markdown={{en: description.en, he: description.he}} />}
                 <AppStoreButton href={ios_link} platform={'ios'} altText='Steinsaltz app on iOS' />
                 <AppStoreButton href={android_link} platform={'android'} altText='Steinsaltz app on Android' />
             </div>
-        </Module>
+        </SidebarModule>
     )
 };
 const PortalOrganization = ({title, description}) => {
     return(
-        <Module>
-                <ModuleTitle en={title.en} he={title.he} />
+        <SidebarModule>
+                <SidebarModuleTitle en={title.en} he={title.he} />
                 {description && <InterfaceText markdown={{en: description.en, he: description.he}} />}
-        </Module>
+        </SidebarModule>
     )
 };
 
 
 const PortalNewsletter = ({title, description}) => {
-    let titleElement = <ModuleTitle en={title.en} he={title.he} />;
+    let titleElement = <SidebarModuleTitle en={title.en} he={title.he} />;
 
     return(
-        <Module>
+        <SidebarModule>
             {titleElement}
             <InterfaceText markdown={{en: description.en, he: description.he}} />
             <NewsletterSignUpForm
@@ -963,14 +960,14 @@ const PortalNewsletter = ({title, description}) => {
                 emailPlaceholder={{en: "Email Address", he: "כתובת מייל"}}
                 subscribe={Sefaria.subscribeSefariaAndSteinsaltzNewsletter}
             />
-        </Module>
+        </SidebarModule>
     )
 };
 
 
 export {
   NavSidebar,
-  Modules,
-  RecentlyViewed, 
-  SidebarFooter
+  SidebarFooter,
+  SidebarModules,
+  RecentlyViewed
 };
diff --git a/static/js/NoteListing.jsx b/static/js/NoteListing.jsx
index ab028cbede..3c793fe125 100644
--- a/static/js/NoteListing.jsx
+++ b/static/js/NoteListing.jsx
@@ -2,7 +2,7 @@ import React  from 'react';
 import $  from './sefaria/sefariaJquery';
 import Sefaria  from './sefaria/sefaria';
 import { AddToSourceSheetWindow } from './AddToSourceSheet';
-import { Note } from './Misc';
+import { Note, LoadingMessage } from './Misc';
 import PropTypes  from 'prop-types';
 import Component      from 'react-class';
 
@@ -59,11 +59,17 @@ class NoteListing extends Component {
 }
 NoteListing.propTypes = {
   data:         PropTypes.object.isRequired,
-  showText:     PropTypes.bool,
   onDeleteNote: PropTypes.func,
 };
-NoteListing.defaultProps = {
-  showText: true
-};
+
+const NotesList = ({notes}) => {  
+  return (
+    notes && notes.length ? 
+      notes.map((item, i) => (
+        <NoteListing data={item} key={i} />
+      ))
+    : <LoadingMessage message="You haven't written any notes yet." heMessage="טרם הוספת רשומות משלך" />)};
+
 
 export default NoteListing;
+export { NotesList };
diff --git a/static/js/NotificationsPanel.jsx b/static/js/NotificationsPanel.jsx
index a522c72a86..3f05d48ed0 100644
--- a/static/js/NotificationsPanel.jsx
+++ b/static/js/NotificationsPanel.jsx
@@ -89,7 +89,7 @@ class NotificationsPanel extends Component {
               notifications :
               <LoginPrompt fullPanel={true} /> }
             </div>
-            <NavSidebar modules={sidebarModules} />
+            <NavSidebar sidebarModules={sidebarModules} />
           </div>
         </div>
       </div>
diff --git a/static/js/ProfilePic.jsx b/static/js/ProfilePic.jsx
new file mode 100644
index 0000000000..701e4b13bc
--- /dev/null
+++ b/static/js/ProfilePic.jsx
@@ -0,0 +1,120 @@
+import React from 'react';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import Component from 'react-class';
+import {ImageCropper} from "./ImageCropper";
+
+/* flexible profile picture that overrides the default image of gravatar with text with the user's initials */
+export class ProfilePic extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            showDefault: !this.props.url || this.props.url.startsWith("https://www.gravatar"), // We can't know in advance if a gravatar image exists of not, so start with the default beforing trying to load image
+            fileToCropSrc: null,
+            uploadError: null,
+            uploading: false,
+        };
+        this.imgFile = React.createRef();
+    }
+    setShowDefault() { /* console.log("error"); */ this.setState({showDefault: true});  }
+    setShowImage() { /* console.log("load"); */ this.setState({showDefault: false});  }
+    componentDidMount() {
+        if (this.didImageLoad()) {
+            this.setShowImage();
+        } else {
+            this.setShowDefault();
+        }
+    }
+    didImageLoad(){
+        // When using React Hydrate, the onLoad event of the profile image will return before
+        // react code runs, so we check after mount as well to look replace bad images, or to
+        // swap in a gravatar image that we now know is valid.
+        const img = this.imgFile.current;
+        return (img && img.complete && img.naturalWidth !== 0);
+    }
+    onSelectFile(e) {
+        if (e.target.files && e.target.files.length > 0) {
+            if (!e.target.files[0].type.startsWith('image/')) {
+                this.setState({uploadError: "Error: Please upload an image with the correct file extension (e.g. jpg, png)"})
+                return;
+            }
+            const reader = new FileReader();
+            reader.addEventListener("load", () => this.setState({fileToCropSrc: reader.result}));
+            console.log("FILE", e.target.files[0]);
+            reader.readAsDataURL(e.target.files[0]);
+        }
+    }
+    onCloseCropper() {
+        this.setState({fileToCropSrc: null, uploadError: null, uploading: false});
+    }
+    async upload(croppedImageBlob) {
+        const formData = new FormData();
+        formData.append('file', croppedImageBlob);
+        this.setState({ uploading: true });
+        console.log("uploading")
+        try {
+            const response = await Sefaria.uploadProfilePhoto(formData);
+            console.log('responsse', response)
+            if (response.error) {
+                throw new Error(response.error);
+            } else {
+                window.location = "/profile/" + Sefaria.slug; // reload to get update
+                return;
+            }
+        } catch (e) {
+            this.setState({fileToCropSrc: null, uploadError: "Upload Error. Please contact hello@sefaria.org for assistance."})
+        }
+        this.setState({ uploading: false });
+    }
+    render() {
+        const { name, url, len, hideOnDefault, showButtons, outerStyle } = this.props;
+        const { showDefault} = this.state;
+        const nameArray = !!name.trim() ? name.trim().split(/\s/) : [];
+        const initials = nameArray.length > 0 ? (nameArray.length === 1 ? nameArray[0][0] : nameArray[0][0] + nameArray[nameArray.length-1][0]) : "";
+        const defaultViz = showDefault ? 'flex' : 'none';
+        const profileViz = showDefault ? 'none' : 'block';
+        const imageSrc = url.replace("profile-default.png", 'profile-default-404.png');  // replace default with non-existant image to force onLoad to fail
+
+        return (
+            <div style={outerStyle} className="profile-pic">
+                <div className={classNames({'default-profile-img': 1, noselect: 1, invisible: hideOnDefault})}
+                     style={{display: defaultViz,  width: len, height: len, fontSize: len/2}}>
+                    { showButtons ? null : `${initials}` }
+                </div>
+                <img
+                    className="img-circle profile-img"
+                    style={{display: profileViz, width: len, height: len, fontSize: len/2}}
+                    src={imageSrc}
+                    alt="User Profile Picture"
+                    ref={this.imgFile}
+                    onLoad={this.setShowImage}
+                    onError={this.setShowDefault}
+                />
+                {this.props.children ? this.props.children : null /*required for slate.js*/}
+                { showButtons ? /* cant style file input directly. see: https://stackoverflow.com/questions/572768/styling-an-input-type-file-button */
+                    (<div className={classNames({"profile-pic-button-visible": showDefault !== null, "profile-pic-hover-button": !showDefault, "profile-pic-button": 1})}>
+                        <input type="file" className="profile-pic-input-file" id="profile-pic-input-file" onChange={this.onSelectFile} onClick={(event)=> { event.target.value = null}}/>
+                        <label htmlFor="profile-pic-input-file" className={classNames({resourcesLink: 1, blue: showDefault})}>
+                            <span className="int-en">{ showDefault ? "Add Picture" : "Upload New" }</span>
+                            <span className="int-he">{ showDefault ? "הוספת תמונה" : "עדכון תמונה" }</span>
+                        </label>
+                    </div>) : null
+                }
+                <ImageCropper
+                    loading={this.state.uploading}
+                    error={this.state.uploadError}
+                    src={this.state.fileToCropSrc}
+                    onClose={this.onCloseCropper}
+                    onSave={this.upload}
+                />
+            </div>
+        );
+    }
+}
+ProfilePic.propTypes = {
+    url:           PropTypes.string,
+    name:          PropTypes.string,
+    len:           PropTypes.number,
+    hideOnDefault: PropTypes.bool,  // hide profile pic if you have are displaying default pic
+    showButtons:   PropTypes.bool,  // show profile pic action buttons
+};
diff --git a/static/js/PublicCollectionsPage.jsx b/static/js/PublicCollectionsPage.jsx
index 3b41d26b7e..2751a6b409 100644
--- a/static/js/PublicCollectionsPage.jsx
+++ b/static/js/PublicCollectionsPage.jsx
@@ -3,7 +3,7 @@ import PropTypes  from 'prop-types';
 import classNames  from 'classnames';
 import Sefaria  from './sefaria/sefaria';
 import Component from 'react-class';
-import { NavSidebar, Modules } from './NavSidebar';
+import { NavSidebar, SidebarModules } from './NavSidebar';
 import {
   InterfaceText,
   LoadingMessage,
@@ -69,7 +69,7 @@ const PublicCollectionsPage = ({multiPanel, initialWidth}) => {
             </h1>
 
             {multiPanel ? null :
-            <Modules type={"AboutCollections"} props={{hideTitle: true}} /> }
+            <SidebarModules type={"AboutCollections"} props={{hideTitle: true}} /> }
 
             <div className="collectionsList">
               { !!collectionsList ?
@@ -88,7 +88,7 @@ const PublicCollectionsPage = ({multiPanel, initialWidth}) => {
               : <LoadingMessage /> }
             </div>
           </div>
-          <NavSidebar modules={sidebarModules} />
+          <NavSidebar sidebarModules={sidebarModules} />
         </div>
       </div>
     </div>
diff --git a/static/js/ReaderApp.jsx b/static/js/ReaderApp.jsx
index 3c65ef408d..697699b174 100644
--- a/static/js/ReaderApp.jsx
+++ b/static/js/ReaderApp.jsx
@@ -572,6 +572,12 @@ class ReaderApp extends Component {
             hist.title = Sefaria._("My Reading History");
             hist.url = "texts/history";
             hist.mode = "history";
+            break;
+          case "notes":
+            hist.title = Sefaria._("My Notes");
+            hist.url = "texts/notes";
+            hist.mode = "notes";
+            break;
         }
         hist.url = addTab(hist.url)
       } else if (state.mode === "Text") {
@@ -986,7 +992,7 @@ toggleSignUpModal(modalContentKind = SignUpModalKind.Default) {
                       showHighlight: true,
                       currentlyVisibleRef: refs,
                     }
-    this.replacePanel(n-1, ref, currVersions, new_opts);
+    this.replacePanel(n-1, ref, currVersions, new_opts, false);
 }
   getHTMLLinkParentOfEventTarget(event){
     //get the lowest level parent element of an event target that is an HTML link tag. Or Null.
@@ -1109,6 +1115,9 @@ toggleSignUpModal(modalContentKind = SignUpModalKind.Default) {
     } else if (path === "/texts/saved") {
       this.showSaved();
 
+    } else if (path === "/texts/notes") {
+      this.showNotes();
+
     } else if (path.match(/\/texts\/.+/)) {
       this.showLibrary(path.slice(7).split("/"));
 
@@ -1529,9 +1538,9 @@ toggleSignUpModal(modalContentKind = SignUpModalKind.Default) {
   openPanelAtEnd(ref, currVersions) {
     this.openPanelAt(this.state.panels.length+1, ref, currVersions);
   }
-  replacePanel(n, ref, currVersions, options) {
+  replacePanel(n, ref, currVersions, options, convertCommentaryRefToBaseRef=true) {
     // Opens a text in in place of the panel currently open at `n`.
-    this.openPanelAt(n, ref, currVersions, options, true);
+    this.openPanelAt(n, ref, currVersions, options, true, convertCommentaryRefToBaseRef);
   }
   openComparePanel(n, connectAfter) {
     const comparePanel = this.makePanelState({
@@ -1728,6 +1737,9 @@ toggleSignUpModal(modalContentKind = SignUpModalKind.Default) {
   showSaved() {
     this.setSinglePanelState({menuOpen: "saved"});
   }
+  showNotes() {
+    this.setSinglePanelState({menuOpen: "notes"});
+  }
   showHistory() {
     this.setSinglePanelState({menuOpen: "history"});
   }
diff --git a/static/js/ReaderPanel.jsx b/static/js/ReaderPanel.jsx
index c4bbc9a3a8..7e25528aa4 100644
--- a/static/js/ReaderPanel.jsx
+++ b/static/js/ReaderPanel.jsx
@@ -16,7 +16,7 @@ import {
 } from './ConnectionsPanel';
 import BookPage  from './BookPage';
 import SearchPage  from './SearchPage';
-import Sheet  from './Sheet';
+import Sheet  from './sheets/Sheet';
 import SheetMetadata  from './SheetMetadata';
 import TopicPageAll  from './TopicPageAll';
 import {TopicPage, TopicCategory}  from './TopicPage';
@@ -685,8 +685,8 @@ class ReaderPanel extends Component {
       );
     }
     if (this.state.mode === "Sheet") {
-      items.push(
-        <Sheet
+      console.log(this.props)
+      menu = <Sheet
           adjustHighlightedAndVisible={this.adjustSheetHighlightedAndVisible}
           panelPosition ={this.props.panelPosition}
           id={this.state.sheetID}
@@ -705,10 +705,9 @@ class ReaderPanel extends Component {
           setDivineNameReplacement={this.props.setDivineNameReplacement}
           divineNameReplacement={this.props.divineNameReplacement}
           hasSidebar={this.props.hasSidebar}
-          toggleSignUpModal={this.props.toggleSignUpModal}
           historyObject={this.props.getHistoryObject(this.state, this.props.hasSidebar)}
-        />
-      );
+          toggleSideUpModal={this.props.toggleSignUpModal}
+        />;
     }
 
     if (this.state.mode === "Connections" || this.state.mode === "TextAndConnections") {
@@ -1036,7 +1035,7 @@ class ReaderPanel extends Component {
           interfaceLang={this.props.interfaceLang} />
       );
 
-    } else if (this.state.menuOpen === "saved" || this.state.menuOpen === "history") {
+    } else if (["saved", "history", "notes"].includes(this.state.menuOpen)) {
       menu = (
           <UserHistoryPanel
               multiPanel={this.props.multiPanel}
diff --git a/static/js/SearchSheetResult.jsx b/static/js/SearchSheetResult.jsx
index f0dec7ec4b..8a19c5135c 100644
--- a/static/js/SearchSheetResult.jsx
+++ b/static/js/SearchSheetResult.jsx
@@ -6,8 +6,8 @@ import PropTypes  from 'prop-types';
 import Component      from 'react-class';
 import {
     ColorBarBox, InterfaceText,
-    ProfilePic,
 } from './Misc';
+import {ProfilePic} from "./ProfilePic";
 
 
 class SearchSheetResult extends Component {
diff --git a/static/js/SheetMetadata.jsx b/static/js/SheetMetadata.jsx
index a6a04d2c5f..c08f9a2206 100644
--- a/static/js/SheetMetadata.jsx
+++ b/static/js/SheetMetadata.jsx
@@ -7,9 +7,8 @@ import {
   LoadingMessage,
   LoginPrompt,
   SheetAuthorStatement,
-  ProfilePic,
-
 } from './Misc';
+import {ProfilePic} from "./ProfilePic";
 import { CollectionsModal } from './CollectionsWidget'
 import React  from 'react';
 import ReactDOM  from 'react-dom';
diff --git a/static/js/StaticPages.jsx b/static/js/StaticPages.jsx
index c365d3bc78..8cc00ab6b6 100644
--- a/static/js/StaticPages.jsx
+++ b/static/js/StaticPages.jsx
@@ -1558,7 +1558,7 @@ const DonatePage = () => (
             enTitle="Where does my gift go? How does Sefaria use the donations it receives?"
             heTitle=""
             enText="<p>Generally, gifts made to Sefaria are considered “unrestricted,” meaning that our staff allocates funds where they’re needed most. This includes everything from the text and learning you see on your screen to the technology support that keeps us online to the time and energy of the Sefaria team.</p>
-                    <p><a href='https://www.guidestar.org/profile/46-4406454'>Sefaria has a Platinum rating on GuideStar</a> and we’re devoted to making sure we’re transparent and open with our donors. For a closer look at our financials, <a target='_blank' href='/static/files/Sefaria_2022_990_Public.pdf'>download the most recent Sefaria 990</a>.</p>"
+                    <p><a href='https://www.guidestar.org/profile/46-4406454'>Sefaria has a Platinum rating on GuideStar</a> and we’re devoted to making sure we’re transparent and open with our donors. For a closer look at our financials, <a target='_blank' href='/static/files/Sefaria_2023_990_Public.pdf'>download the most recent Sefaria 990</a>.</p>"
             heText=""
             colorBar="#B8D4D3"
         />
@@ -1728,7 +1728,7 @@ const DonatePage = () => (
                         rounded={true}
                         tall={false}
                         newTab={true}
-                        href="/static/files/Sefaria_2022_990_Public.pdf"
+                        href="/static/files/Sefaria_2023_990_Public.pdf"
                         he_href=""
                         he=""
                         en="See Here"
diff --git a/static/js/TextCategoryPage.jsx b/static/js/TextCategoryPage.jsx
index fbaf26c997..2800c3885e 100644
--- a/static/js/TextCategoryPage.jsx
+++ b/static/js/TextCategoryPage.jsx
@@ -99,7 +99,7 @@ const TextCategoryPage = ({category, categories, setCategories, toggleLanguage,
               initialWidth={initialWidth}
               nestLevel={nestLevel} />
           </div>
-          {!compare ? <NavSidebar modules={sidebarModules} /> : null}
+          {!compare ? <NavSidebar sidebarModules={sidebarModules} /> : null}
         </div>
       </div>
     </div>
diff --git a/static/js/TextsPage.jsx b/static/js/TextsPage.jsx
index 29ddb58a91..b11d95d981 100644
--- a/static/js/TextsPage.jsx
+++ b/static/js/TextsPage.jsx
@@ -3,7 +3,7 @@ import PropTypes  from 'prop-types';
 import classNames  from 'classnames';
 import Sefaria  from './sefaria/sefaria';
 import $  from './sefaria/sefariaJquery';
-import { NavSidebar, Modules, RecentlyViewed } from './NavSidebar';
+import { NavSidebar, SidebarModules, RecentlyViewed } from './NavSidebar';
 import TextCategoryPage  from './TextCategoryPage';
 import ComparePanelHeader from './ComparePanelHeader';
 import {
@@ -78,7 +78,7 @@ const TextsPage = ({categories, settings, setCategories, onCompareBack, openSear
     </div>
 
   const about = compare || multiPanel ? null :
-    <Modules type={"AboutSefaria"} props={{hideTitle: true}}/>;
+    <SidebarModules type={"AboutSefaria"} props={{hideTitle: true}}/>;
 
   const dedication = Sefaria._siteSettings.TORAH_SPECIFIC && !compare ? <Dedication /> : null;
 
@@ -109,7 +109,7 @@ const TextsPage = ({categories, settings, setCategories, onCompareBack, openSear
             { !multiPanel && <RecentlyViewed toggleSignUpModal={toggleSignUpModal} mobile={true}/>}
             { categoryListings }
           </div>
-          {!compare ? <NavSidebar modules={sidebarModules} /> : null}
+          {!compare ? <NavSidebar sidebarModules={sidebarModules} /> : null}
         </div>
       </div>
     </div>
diff --git a/static/js/TopicPage.jsx b/static/js/TopicPage.jsx
index 426a42d675..a0d47bf6d0 100644
--- a/static/js/TopicPage.jsx
+++ b/static/js/TopicPage.jsx
@@ -284,7 +284,7 @@ const TopicCategory = ({topic, topicTitle, setTopic, setNavTopic, compare, initi
                         <ResponsiveNBox content={topicBlocks} initialWidth={initialWidth} />
                       </div>
                   </div>
-                  <NavSidebar modules={sidebarModules} />
+                  <NavSidebar sidebarModules={sidebarModules} />
                 </div>
             </div>
         </div>
@@ -531,16 +531,16 @@ const PortalNavSideBar = ({portal, entriesToDisplayList}) => {
     "organization": "PortalOrganization",
     "newsletter": "PortalNewsletter"
     }
-    const modules = [];
+    const sidebarModules = [];
     for (let key of entriesToDisplayList) {
         if (!portal[key]) { continue; }
-        modules.push({
+        sidebarModules.push({
             type: portalModuleTypeMap[key],
             props: portal[key],
         });
     }
     return(
-        <NavSidebar modules={modules} />
+        <NavSidebar sidebarModules={sidebarModules} />
     )
 };
 
diff --git a/static/js/TopicPageAll.jsx b/static/js/TopicPageAll.jsx
index 195d59434c..4e03f4be94 100644
--- a/static/js/TopicPageAll.jsx
+++ b/static/js/TopicPageAll.jsx
@@ -117,7 +117,7 @@ class TopicPageAll extends Component {
                 }
               </div>
             </div>
-            <NavSidebar modules={sidebarModules} />
+            <NavSidebar sidebarModules={sidebarModules} />
           </div>
         </div>
       </div>
diff --git a/static/js/TopicsPage.jsx b/static/js/TopicsPage.jsx
index 0a289732e8..ef35bfefcb 100644
--- a/static/js/TopicsPage.jsx
+++ b/static/js/TopicsPage.jsx
@@ -7,7 +7,7 @@ import PropTypes  from 'prop-types';
 import classNames  from 'classnames';
 import Sefaria  from './sefaria/sefaria';
 import $  from './sefaria/sefariaJquery';
-import { NavSidebar, Modules } from './NavSidebar';
+import { NavSidebar, SidebarModules } from './NavSidebar';
 import {CategoryHeader} from "./Misc";
 import Component from 'react-class';
 
@@ -44,7 +44,7 @@ const TopicsPage = ({setNavTopic, multiPanel, initialWidth}) => {
   );
 
   const about = multiPanel ? null :
-    <Modules type={"AboutTopics"} props={{hideTitle: true}} />;
+    <SidebarModules type={"AboutTopics"} props={{hideTitle: true}} />;
 
   const sidebarModules = [
     multiPanel ? {type: "AboutTopics"} : {type: null},
@@ -67,7 +67,7 @@ const TopicsPage = ({setNavTopic, multiPanel, initialWidth}) => {
               { about }
               { categoryListings }
           </div>
-          <NavSidebar modules={sidebarModules} />
+          <NavSidebar sidebarModules={sidebarModules} />
         </div>
       </div>
     </div>
diff --git a/static/js/TranslationsPage.jsx b/static/js/TranslationsPage.jsx
index 72f7dbbf38..aaf362efe3 100644
--- a/static/js/TranslationsPage.jsx
+++ b/static/js/TranslationsPage.jsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import Sefaria from "./sefaria/sefaria";
 import classNames  from 'classnames';
 import {InterfaceText, TabView} from './Misc';
-import { NavSidebar, Modules } from './NavSidebar';
+import { NavSidebar, SidebarModules } from './NavSidebar';
 
 
 const TranslationsPage = ({translationsSlug}) => {
@@ -88,7 +88,7 @@ const TranslationsPage = ({translationsSlug}) => {
               </>
               </TabView>}
               </div>
-            <NavSidebar modules={sidebarModules} />
+            <NavSidebar sidebarModules={sidebarModules} />
           </div>
         </div>
       </div>
diff --git a/static/js/UserHistoryPanel.jsx b/static/js/UserHistoryPanel.jsx
index 4e94ec364a..f24b94f116 100644
--- a/static/js/UserHistoryPanel.jsx
+++ b/static/js/UserHistoryPanel.jsx
@@ -5,6 +5,7 @@ import Component from 'react-class';
 import Sefaria  from './sefaria/sefaria';
 import { useScrollToLoad } from "./Hooks";
 import { NavSidebar } from './NavSidebar';
+import { NotesList } from './NoteListing';
 import { 
   SheetBlock,
   TextPassage
@@ -21,9 +22,23 @@ import {
 
 
 const UserHistoryPanel = ({menuOpen, toggleLanguage, openDisplaySettings, openNav, compare, toggleSignUpModal}) => {
-  const store = menuOpen === "saved" ? Sefaria.saved : Sefaria.userHistory;
+  const [notes, setNotes] = useState(null);
   const contentRef = useRef();
 
+  useEffect(() => {
+    Sefaria.allPrivateNotes((data) => {
+      if (Array.isArray(data)) {
+        const flattenedNotes = data.map(note => ({
+          ref: note.ref,
+          text: note.text
+        }));
+        setNotes(flattenedNotes); 
+      } else {
+        console.error("Unexpected data format:", data);
+      }
+    });
+  }, []);
+
   const title = (
     <span className="sans-serif">
       <a href="/texts/saved" className={"navTitleTab" + (menuOpen === "saved" ? " current" : "")}>
@@ -34,6 +49,10 @@ const UserHistoryPanel = ({menuOpen, toggleLanguage, openDisplaySettings, openNa
         <img src="/static/icons/clock.svg" />
         <InterfaceText>History</InterfaceText>
       </a>
+      <a href="/texts/notes" className={"navTitleTab" + (menuOpen === "notes" ? " current" : "")}> 
+        <img src="/static/icons/notes-icon.svg" /> 
+        <InterfaceText>Notes</InterfaceText>
+      </a>
     </span>
   );
 
@@ -55,19 +74,24 @@ const UserHistoryPanel = ({menuOpen, toggleLanguage, openDisplaySettings, openNa
               {Sefaria.interfaceLang !== "hebrew" && Sefaria._siteSettings.TORAH_SPECIFIC ?
               <LanguageToggleButton toggleLanguage={toggleLanguage} /> : null}
             </div>
-            <UserHistoryList
-              store={store}
-              scrollableRef={contentRef}
-              menuOpen={menuOpen}
-              toggleSignUpModal={toggleSignUpModal}
-              key={menuOpen}/>
+            { menuOpen === "notes" ?
+                  <NotesList notes={notes} />
+                 :
+                  <UserHistoryList
+                    store={menuOpen === "saved" ? Sefaria.saved : Sefaria.userHistory}
+                    scrollableRef={contentRef}
+                    menuOpen={menuOpen}
+                    toggleSignUpModal={toggleSignUpModal}
+                    key={menuOpen}/>
+            }
           </div>
-          <NavSidebar modules={sidebarModules} />
+          <NavSidebar sidebarModules={sidebarModules} />
         </div>
       </div>
     </div>
-    );
+  );
 };
+
 UserHistoryPanel.propTypes = {
   toggleLanguage:      PropTypes.func.isRequired,
   openDisplaySettings: PropTypes.func.isRequired,
diff --git a/static/js/UserProfile.jsx b/static/js/UserProfile.jsx
index deb3acfc52..25a2655b7a 100644
--- a/static/js/UserProfile.jsx
+++ b/static/js/UserProfile.jsx
@@ -10,10 +10,10 @@ import {
   TabView,
   SheetListing,
   ProfileListing,
-  ProfilePic,
   FollowButton,
   InterfaceText,
 } from './Misc';
+import {ProfilePic} from "./ProfilePic";
 import { SignUpModalKind } from './sefaria/signupModalContent';
 
 class UserProfile extends Component {
diff --git a/static/js/linker.v3/main.js b/static/js/linker.v3/main.js
index 8a428e7053..ed2b5cc8f4 100644
--- a/static/js/linker.v3/main.js
+++ b/static/js/linker.v3/main.js
@@ -441,7 +441,8 @@ import {LinkExcluder} from "./excluder";
         return new Promise((resolve, reject) => {
             fetch(getFindRefsUrl(), {
                 method: 'POST',
-                body: JSON.stringify(postData)
+                body: JSON.stringify(postData),
+                headers: {'Content-Type': 'application/json'},
             })
                 .then(handleApiResponse)
                 .then(resp => resolve(resp));
diff --git a/static/js/sefaria/sefaria.js b/static/js/sefaria/sefaria.js
index 7a286b8723..9e1676873d 100644
--- a/static/js/sefaria/sefaria.js
+++ b/static/js/sefaria/sefaria.js
@@ -692,7 +692,7 @@ Sefaria = extend(Sefaria, {
           return result;
       }
   },
-  apiRequestWithBody: async function(url, urlParams, payload, method="POST") {
+  apiRequestWithBody: async function(url, urlParams, payload, method="POST", convertResponseToJSON=true) {
     /**
      * Generic function for performing an API request with a payload. Payload and urlParams are optional and will not be used if falsy.
      */
@@ -710,17 +710,18 @@ Sefaria = extend(Sefaria, {
         credentials: 'same-origin',
         body: payload && JSON.stringify(payload)
     });
-
-    if (!response.ok) {
-        throw new Error("Error posting to API");
-    }
-
-    const json = await response.json();
-    if (json.error) {
-        throw new Error(json.error);
+    if (convertResponseToJSON) {
+        if (!response.ok) {
+            throw new Error("Error posting to API");
+        }
+        const json = await response.json();
+        if (json.error) {
+            throw new Error(json.error);
+        }
+        return json;
+    } else {
+        return response;
     }
-
-    return json;
 },
   subscribeSefariaAndSteinsaltzNewsletter: async function(firstName, lastName, email, educatorCheck) {
       const responses = await Promise.all([
@@ -1620,12 +1621,12 @@ Sefaria = extend(Sefaria, {
     // First sort by predefined "top"
     const hebrewTopByCategory = {
       "Tanakh": ["Rashi", "Ibn Ezra", "Ramban", "Sforno"],
-      "Talmud": ["Rashi", "Tosafot"],
+      "Talmud": ["Rashi", "Rashbam", "Tosafot"],
       "Mishnah": ["Bartenura", "Rambam", "Ikar Tosafot Yom Tov", "Yachin", "Boaz"]
     };
     const englishTopByCategory = {
       "Tanakh": ["Rashi", "Ibn Ezra", "Ramban", "Sforno"],
-      "Talmud": ["Rashi", "Tosafot"],
+      "Talmud": ["Rashi", "Rashbam", "Tosafot"],
       "Mishnah": ["Bartenura", "English Explanation of Mishnah", "Rambam", "Ikar Tosafot Yom Tov", "Yachin", "Boaz"]
     };
     const top = (byHebrew ? hebrewTopByCategory[category] : englishTopByCategory[category]) || [];
diff --git a/static/js/Sheet.jsx b/static/js/sheets/Sheet.jsx
similarity index 86%
rename from static/js/Sheet.jsx
rename to static/js/sheets/Sheet.jsx
index ce8e6fb11f..c0bdc2cc3b 100644
--- a/static/js/Sheet.jsx
+++ b/static/js/sheets/Sheet.jsx
@@ -1,19 +1,16 @@
 import React  from 'react';
 import ReactDOM  from 'react-dom';
-import PropTypes  from 'prop-types';
 import classNames  from 'classnames';
-import sanitizeHtml  from 'sanitize-html';
 import Component from 'react-class'
-import $  from './sefaria/sefariaJquery';
-import Sefaria  from './sefaria/sefaria';
-import SefariaEditor from './Editor';
+import $  from '../sefaria/sefariaJquery';
+import Sefaria  from '../sefaria/sefaria';
+import SefariaEditor from '../Editor';
+import SheetContentSidebar from "./SheetContentSidebar";
 import {
-  InterfaceText,
   LoadingMessage,
-} from './Misc';
-import {SheetOptions} from "./sheets/SheetOptions";
-import SheetContentSidebar from "./sheets/SheetContentSidebar";
-import SheetContent from "./sheets/SheetContent";
+} from '../Misc'; 
+import {SheetOptions} from "./SheetOptions";
+import {SheetContent} from "./SheetContent";
 
 class Sheet extends Component {
   constructor(props) {
@@ -72,7 +69,7 @@ class Sheet extends Component {
 
       else if (Sefaria.isRef(path.slice(1))) {
         e.preventDefault();
-        window.open(target.href);
+        Sefaria.util.openInNewTab(target.href);
       }
     }
   }
@@ -150,14 +147,4 @@ class Sheet extends Component {
   }
 }
 
-class SheetNotice extends Component {
-  render() {
-    return (
-        <div className="sheetNotice sans-serif">
-          <InterfaceText>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam arcu felis, molestie sed mauris a, hendrerit vestibulum augue.</InterfaceText>
-        </div>
-    );
-  }
-}
-
 export default Sheet;
diff --git a/static/js/sheets/SheetContent.jsx b/static/js/sheets/SheetContent.jsx
index 1cf9875ffa..9a69f8db8f 100644
--- a/static/js/sheets/SheetContent.jsx
+++ b/static/js/sheets/SheetContent.jsx
@@ -16,6 +16,7 @@ import {SheetMetaDataBox} from "../Misc";
 import React from "react";
 import {SignUpModalKind} from "../sefaria/signupModalContent";
 
+
 class SheetContent extends Component {
   componentDidMount() {
       this.$container = $(ReactDOM.findDOMNode(this).parentNode);
@@ -79,9 +80,12 @@ class SheetContent extends Component {
     if (!$segment) { return; }
 
     // don't move around highlighted segment when scrolling a single panel,
-    const node = parseInt($segment.attr("data-node"));
-    if (!(this.props.highlightedNode === node)) {
-      $segment.click();
+    var shouldHighlight = this.props.hasSidebar || this.props.mode === "SheetAndConnections";
+    if (shouldHighlight) {
+      const node = parseInt($segment.attr("data-node"));
+      if (!(this.props.highlightedNode === node)) {
+        $segment.click()
+      }
     }
   }
   scrollToHighlighted() {
@@ -271,4 +275,15 @@ const AddToSheetButton = ({highlightedNode, sheetID, highlightedRefs, toggleSign
         <AddToSourceSheetModal nodeRef={nodeRef} srefs={highlightedRefs} close={() => setShowingModal(false)}/>}
   </>;
 }
-export default SheetContent;
\ No newline at end of file
+
+class SheetNotice extends Component {
+  render() {
+    return (
+        <div className="sheetNotice sans-serif">
+          <InterfaceText>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam arcu felis, molestie sed mauris a, hendrerit vestibulum augue.</InterfaceText>
+        </div>
+    );
+  }
+}
+
+export { SheetContent };
diff --git a/static/js/sheets/SheetContentSegments.jsx b/static/js/sheets/SheetContentSegments.jsx
index 68b20bb6f1..1b5c2b4d21 100644
--- a/static/js/sheets/SheetContentSegments.jsx
+++ b/static/js/sheets/SheetContentSegments.jsx
@@ -14,6 +14,7 @@ class SheetSource extends Component {
     const containerClasses = classNames(
       "sheetItem",
       "segment",
+      this.props.highlighted && "highlight",
       (this.props.source.text && this.props.source.text.en && this.props.source.text.en.stripHtml() === "...") || (this.props.source.text && (!this.props.source.text.en || !this.props.source.text.en.stripHtml())) ? "heOnly" : null,
       (this.props.source.text && this.props.source.text.he && this.props.source.text.he.stripHtml() === "...") || (this.props.source.text && (!this.props.source.text.he || !this.props.source.text.he.stripHtml())) ? "enOnly" : null,
       this.props.source.options && this.props.source.options.refDisplayPosition ? "ref-display-"+ this.props.source.options.refDisplayPosition : null
@@ -77,6 +78,7 @@ class SheetComment extends Component {
       "sheetItem",
       "segment",
       lang == "he" ? "heOnly" : "enOnly",
+      this.props.source.node === this.props.highlightedNode && "highlight",
       this.props.source.options ? this.props.source.options.indented : null
     );
 
@@ -112,6 +114,7 @@ class SheetHeader extends Component {
     const containerClasses = classNames("sheetItem",
         "segment",
         lang == "he" ? "heOnly" : "enOnly",
+        this.props.source.node === this.props.highlightedNode && "highlight",
         this.props.source.options ? this.props.source.options.indented : null
     );
 
@@ -146,6 +149,7 @@ class SheetOutsideText extends Component {
     const containerClasses = classNames("sheetItem",
         "segment",
         lang == "he" ? "heOnly" : "enOnly",
+        this.props.source.node === this.props.highlightedNode && "highlight",
         this.props.source.options ? this.props.source.options.indented : null
     );
 
@@ -180,6 +184,7 @@ class SheetOutsideBiText extends Component {
       "segment",
       (this.props.source.outsideBiText.en && this.props.source.outsideBiText.en.stripHtml() === "...") || (!this.props.source.outsideBiText.en.stripHtml()) ? "heOnly" : null,
       (this.props.source.outsideBiText.he && this.props.source.outsideBiText.he.stripHtml() === "...") || (!this.props.source.outsideBiText.he.stripHtml()) ? "enOnly" : null,
+      this.props.source.node === this.props.highlightedNode && "highlight",
     );
 
     const sectionClasses= classNames("SheetOutsideBiText",
@@ -264,6 +269,7 @@ class SheetMedia extends Component {
     const containerClasses = classNames(
       "sheetItem",
       "segment",
+      this.props.source.node === this.props.highlightedNode && "highlight",
       this.props.source.options ? this.props.source.options.indented : null
     );
     return (
diff --git a/static/js/sheets/SheetContentSidebar.jsx b/static/js/sheets/SheetContentSidebar.jsx
index dc76489eb1..e1df71008b 100644
--- a/static/js/sheets/SheetContentSidebar.jsx
+++ b/static/js/sheets/SheetContentSidebar.jsx
@@ -1,7 +1,8 @@
-import {FollowButton, InterfaceText, ProfilePic} from "../Misc";
+import {FollowButton, InterfaceText} from "../Misc";
 import Sefaria from "../sefaria/sefaria";
 import React, {useEffect, useState} from "react";
 import {ProfileBio} from "../UserProfile";
+import {ProfilePic} from "../ProfilePic";
 const SheetContentSidebar = ({authorImage, authorStatement, authorUrl, toggleSignUpModal, collections}) => {
     const [loading, setLoading] = useState(true);
     const [profile, setProfile] = useState(null);
@@ -21,12 +22,12 @@ const SheetContentSidebar = ({authorImage, authorStatement, authorUrl, toggleSig
                 name={authorStatement}
             />
             {authorName}
-            {!loading && <SheetProfileInfo profile={profile}/>}
+            {!loading && <SheetProfileInfo profile={profile} toggleSignUpModal={toggleSignUpModal}/>}
             {<PartOfCollections collections={collections}/>}
     </div>;
 }
 
-const SheetProfileInfo = ({profile}) => {
+const SheetProfileInfo = ({profile, toggleSignUpModal}) => {
     const profileFollowers = <div className="profileFollowers">
                                              <InterfaceText>{String(profile.followers.length)}</InterfaceText>&nbsp;
                                              <InterfaceText>followers</InterfaceText>
@@ -37,7 +38,8 @@ const SheetProfileInfo = ({profile}) => {
              {Sefaria._uid !== profile.id && <FollowButton
                                                 large={true}
                                                 uid={profile.id}
-                                                following={Sefaria.following.indexOf(profile.id) > -1}/>
+                                                following={Sefaria.following.indexOf(profile.id) > -1}
+                                                toggleSignUpModal={toggleSignUpModal}/>
              }
            </span>;
 }
diff --git a/static/js/sheets/SheetOptions.jsx b/static/js/sheets/SheetOptions.jsx
index 5087306c46..b7f6ce2070 100644
--- a/static/js/sheets/SheetOptions.jsx
+++ b/static/js/sheets/SheetOptions.jsx
@@ -10,6 +10,7 @@ import {AddToSourceSheetBox} from "../AddToSourceSheet";
 import {CollectionsWidget} from "../CollectionsWidget";
 const modifyHistoryObjectForSheetOptions = (historyObject) => {
   // we want the 'ref' property to be for the sheet itself and not its segments, as in "Sheet 3" not "Sheet 3:4"
+  // because in the modularization version of the sheets viewer, the UI is designed so that the sheet is saved, not a specific segment
   let newHistoryObject = Object.assign({}, historyObject);
   const refParts = newHistoryObject.ref.split(":");
   newHistoryObject.ref = refParts[0];
@@ -240,34 +241,34 @@ const GoogleDocExportModal = ({ sheetID, close }) => {
     exportComplete: { en: "Success!", he: "ייצוא הסתיים"}
   }
   const [googleDriveText, setGoogleDriveText] = useState(googleDriveState.exporting);
-
   const [googleDriveLink, setGoogleDriveLink] = useState("");
-  const sheet = Sefaria.sheets.loadSheetByID(sheetID);
-
-  useEffect(() => {
+  const exportToDrive = async () => {
     if (googleDriveText.en === googleDriveState.exporting.en) {
       history.replaceState("", document.title, window.location.pathname + window.location.search); // remove exportToDrive hash once it's used to trigger export
-      $.ajax({
-        type: "POST",
-        url: "/api/sheets/" + sheet.id + "/export_to_drive",
-        success: function (data) {
-          if ("error" in data) {
-            console.log(data.error.message);
-            // Export Failed
-          } else {
-            // Export succeeded
-            setGoogleDriveLink(data.webViewLink);
-            setGoogleDriveText(googleDriveState.exportComplete)
-          }
-        },
-        statusCode: {
-          401: function () {
-            window.location.href = "/gauth?next=" + encodeURIComponent(window.location.protocol + '//' + window.location.host + window.location.pathname + window.location.search + "#afterLoading=exportToDrive");
-          }
+      try {
+        const response = await Sefaria.apiRequestWithBody(`/api/sheets/${sheetID}/export_to_drive`, null, {}, "POST", false);
+        if (response.status === 401) {
+          // couldn't authenticate, so forward to google authentication
+          window.location.href = `/gauth?next=${encodeURIComponent(window.location.protocol + '//' + window.location.host + window.location.pathname + window.location.search + "#afterLoading=exportToDrive")}`;
+          return;
+        }
+        const data = await response.json();
+        if ("error" in data) {
+          setGoogleDriveText(data.error.message);
+        } else {
+          // Export succeeded
+          setGoogleDriveLink(data.webViewLink);
+          setGoogleDriveText(googleDriveState.exportComplete);
         }
-      });
+      } catch (error) {
+        setGoogleDriveText(data.error);
+      }
     }
-  }, [googleDriveText]);
+  }
+
+  useEffect(() => {
+      exportToDrive();
+    }, [googleDriveText]);
   const getExportMessage = () => {
     if (googleDriveText.en === googleDriveState.exporting.en) {
       return <InterfaceText text={googleDriveText}/>;
diff --git a/templates/base.html b/templates/base.html
index 63e8e26dfd..17776727d4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -71,7 +71,7 @@
     <script>
         WebFont.load({
           google: {
-            families: ['Crimson Text:400,700'],
+            families: ['Crimson Text:100,200,300,400,500,600,700,800,900'],
             text: 'ăǎġḥḤḫḳḲŏŠšṭżūẓŻāīēḗęîїìi̧ ̆̄'
           },
           typekit: {
@@ -80,7 +80,7 @@
         });
         WebFont.load({
           google: {
-            families: ['Roboto:300,400,500,600,700', 'Heebo:300,400,700:hebrew'] // The dotted h causes Heebo not to load.
+            families: ['Roboto:100,200,300,400,500,600,700,800,900', 'Heebo:100,200,300,400,500,600,700,800,900:hebrew'] // The dotted h causes Heebo not to load.
           }
         });
         WebFont.load({
diff --git a/templates/static/he/ways-to-give.html b/templates/static/he/ways-to-give.html
index 6eb6051dc2..d7e49e4d1c 100644
--- a/templates/static/he/ways-to-give.html
+++ b/templates/static/he/ways-to-give.html
@@ -150,7 +150,7 @@ <h2>
             </header>
             <section>
                 <span class="int-he">
-                    <a target="_blank" href="{% static "files/Sefaria_2022_990_Public.pdf" %}">דוח 990</a>
+                    <a target="_blank" href="{% static "files/Sefaria_2023_990_Public.pdf" %}">דוח 990</a>
                 </span>
             </section>
             <section>