diff --git a/admin.py b/admin.py
index 877c359..1acc042 100644
--- a/admin.py
+++ b/admin.py
@@ -1,35 +1,94 @@
 from django.contrib import admin
 
-from plugins.books.models import *
+import plugins.books.models as models
 
 
+@admin.register(models.BookSetting)
 class BookSettingAdmin(admin.ModelAdmin):
     list_display = ('book_page_title',)
 
 
+class ContributorLinkInline(admin.TabularInline):
+    model = models.ContributorLink
+    extra = 1
+    raw_id_fields = ('contributor',)
+
+
+@admin.register(models.Chapter)
 class ChapterAdmin(admin.ModelAdmin):
-    """Displays objects in the Django admin interface."""
     list_display = ('title', 'number', 'book', 'pages', 'doi')
     list_filter = ('book',)
-    search_fields = ('title',)
+    search_fields = ('title', 'book__title', 'doi')
     raw_id_fields = ('book',)
-    filter_horizontal = ('contributors',)
+    inlines = [ContributorLinkInline]
 
 
+@admin.register(models.BookAccess)
 class BookAccessAdmin(admin.ModelAdmin):
     list_display = ('book', 'chapter', 'type', 'format', 'country', 'accessed')
+    list_filter = ('book', 'type', 'format', 'country')
+    search_fields = ('book__title', 'chapter__title')
+
+
+@admin.register(models.Book)
+class BookAdmin(admin.ModelAdmin):
+    list_display = ('title', 'publisher_name', 'date_published', 'is_open_access')
+    list_filter = ('is_open_access', 'peer_reviewed', 'date_published', 'categories')
+    search_fields = ('title', 'subtitle', 'publisher_name', 'isbn', 'doi')
+    filter_horizontal = ('keywords', 'publisher_notes', 'linked_repository_objects', 'categories')
+
+
+@admin.register(models.Contributor)
+class ContributorAdmin(admin.ModelAdmin):
+    list_display = ('last_name', 'first_name', 'affiliation')
+    search_fields = ('first_name', 'last_name', 'affiliation', 'email')
+
+
+@admin.register(models.ContributorLink)
+class ContributorLinkAdmin(admin.ModelAdmin):
+    list_display = ('contributor', 'book', 'chapter', 'order')
+    list_filter = ('book', 'chapter')
+    raw_id_fields = ('contributor', 'book', 'chapter')
+
+
+@admin.register(models.Format)
+class FormatAdmin(admin.ModelAdmin):
+    list_display = ('title', 'book', 'sequence')
     list_filter = ('book',)
-    search_fields = ('book__title',)
+    search_fields = ('title', 'filename')
+    raw_id_fields = ('book',)
+
+
+@admin.register(models.Category)
+class CategoryAdmin(admin.ModelAdmin):
+    list_display = ('name', 'slug', 'display_title')
+    search_fields = ('name', 'slug')
+
+
+@admin.register(models.BookPreprint)
+class BookPreprintAdmin(admin.ModelAdmin):
+    list_display = ('book', 'preprint', 'order')
+    list_filter = ('book',)
+    raw_id_fields = ('book', 'preprint')
+
+
+@admin.register(models.KeywordBook)
+class KeywordBookAdmin(admin.ModelAdmin):
+    list_display = ('keyword', 'book', 'order')
+    list_filter = ('book',)
+    search_fields = ('keyword__word',)
+    raw_id_fields = ('keyword', 'book')
+
 
+@admin.register(models.KeywordChapter)
+class KeywordChapterAdmin(admin.ModelAdmin):
+    list_display = ('keyword', 'chapter', 'order')
+    list_filter = ('chapter',)
+    search_fields = ('keyword__word',)
+    raw_id_fields = ('keyword', 'chapter')
 
-admin_list = [
-    (Book, ),
-    (Contributor,),
-    (Format,),
-    (BookAccess, BookAccessAdmin),
-    (Chapter, ChapterAdmin),
-    (Category,),
-    (BookSetting, BookSettingAdmin)
-]
 
-[admin.site.register(*t) for t in admin_list]
+@admin.register(models.PublisherNote)
+class PublisherNoteAdmin(admin.ModelAdmin):
+    list_display = ('note',)
+    search_fields = ('note',)
diff --git a/files.py b/files.py
index 0802163..9a08a90 100644
--- a/files.py
+++ b/files.py
@@ -58,28 +58,26 @@ def serve_book_file(book_format):
         raise Http404
 
 
-def server_chapter_file(book_chapter):
+def serve_chapter_format_file(chapter_format):
     file_path = os.path.join(
         settings.BASE_DIR,
         'files',
         'press',
         'books',
-        book_chapter.filename,
+        chapter_format.filename,
     )
 
     if os.path.isfile(file_path):
-        filename, extension = os.path.splitext(book_chapter.filename)
+        filename, extension = os.path.splitext(chapter_format.filename)
         response = StreamingHttpResponse(
             FileWrapper(open(file_path, 'rb'), 8192),
-            content_type=files.guess_mime(book_chapter.filename),
+            content_type=files.guess_mime(chapter_format.filename),
         )
         response['Content-Length'] = os.path.getsize(file_path)
-        response['Content-Disposition'] = 'attachment;' \
-                                          ' filename="{0}{1}"'.format(
-            slugify(book_chapter.title),
-            extension
+        response['Content-Disposition'] = 'attachment; filename="{0}{1}"'.format(
+            slugify(chapter_format.chapter.title),
+            extension,
         )
-
         return response
     else:
         raise Http404
diff --git a/forms.py b/forms.py
index 2b00376..481d573 100644
--- a/forms.py
+++ b/forms.py
@@ -6,6 +6,7 @@
 from django_summernote.widgets import SummernoteWidget
 
 from plugins.books import models, files
+from repository import models as repository_models
 
 
 class DateInput(forms.DateInput):
@@ -44,9 +45,10 @@ class BookForm(forms.ModelForm):
 
     class Meta:
         model = models.Book
-        exclude = ('keywords', 'publisher_notes')
+        exclude = ('keywords', 'publisher_notes', 'linked_repository_objects', 'contributors')
         widgets = {
             'description': SummernoteWidget(),
+            'notes': SummernoteWidget(),
             'date_published': DateInput(),
             'date_embargo': DateInput(),
         }
@@ -54,21 +56,33 @@ class Meta:
 
 class ContributorForm(forms.ModelForm):
 
-    def __init__(self, *args, **kwargs):
-        book = kwargs.pop('book', None)
-        super(ContributorForm, self).__init__(*args, **kwargs)
-
-        self.fields['sequence'].initial = book.get_next_contributor_sequence()
-
     class Meta:
         model = models.Contributor
-        exclude = ('book',)
+        fields = (
+            'is_corporate',
+            'corporate_name',
+            'first_name',
+            'middle_name',
+            'last_name',
+            'affiliation',
+            'email',
+            'bio',
+            'headshot',
+        )
+        widgets = {
+            'bio': SummernoteWidget(),
+        }
 
 
 class FormatForm(forms.ModelForm):
 
     file = forms.FileField()
 
+    def __init__(self, *args, **kwargs):
+        super(FormatForm, self).__init__(*args, **kwargs)
+        if self.instance and self.instance.pk and self.instance.filename:
+            self.fields['file'].required = False
+
     class Meta:
         model = models.Format
         exclude = ('book', 'filename')
@@ -76,8 +90,10 @@ class Meta:
     def save(self, commit=True, *args, **kwargs):
         save_format = super(FormatForm, self).save(commit=False)
         file = self.cleaned_data["file"]
-        filename = files.save_file_to_disk(file, save_format)
-        save_format.filename = filename
+
+        if file:
+            filename = files.save_file_to_disk(file, save_format)
+            save_format.filename = filename
 
         if commit:
             save_format.save()
@@ -90,15 +106,56 @@ def clean(self):
         return cleaned_data
 
 
+class ChapterFormatForm(forms.ModelForm):
+
+    file = forms.FileField()
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.instance and self.instance.pk and self.instance.filename:
+            self.fields['file'].required = False
+
+    class Meta:
+        model = models.ChapterFormat
+        exclude = ('chapter', 'filename')
+
+    def save(self, commit=True, *args, **kwargs):
+        chapter_format = super().save(commit=False)
+        file = self.cleaned_data.get('file')
+
+        if file:
+            filename = files.save_file_to_disk(file, chapter_format)
+            chapter_format.filename = filename
+
+        if commit:
+            chapter_format.save()
+
+        return chapter_format
+
+
 class ChapterForm(forms.ModelForm):
 
+    contributors = forms.ModelMultipleChoiceField(
+        queryset=models.Contributor.objects.none(),
+        required=False,
+    )
+
     def __init__(self, *args, **kwargs):
         items = kwargs.pop('items', None)
         super(ChapterForm, self).__init__(*args, **kwargs)
         self.fields['contributors'].widget = TableMultiSelect(items=items)
-        self.fields['contributors'].required = False
-
-    file = forms.FileField(required=False)
+        # Set queryset from items
+        pks = [row.get('object').pk for row in items if row.get('object')]
+        self.fields['contributors'].queryset = models.Contributor.objects.filter(
+            pk__in=pks,
+        )
+        # Set initial from existing ContributorLinks
+        if self.instance and self.instance.pk:
+            self.fields['contributors'].initial = list(
+                models.ContributorLink.objects.filter(
+                    chapter=self.instance,
+                ).values_list('contributor_id', flat=True)
+            )
 
     class Meta:
         model = models.Chapter
@@ -111,7 +168,6 @@ class Meta:
             'date_embargo',
             'date_published',
             'sequence',
-            'contributors',
             'license_information',
             'custom_how_to_cite',
         ]
@@ -122,16 +178,39 @@ def save(self, commit=True, book=None, *args, **kwargs):
         if book:
             save_chapter.book = book
 
-        file = self.cleaned_data["file"]
-        if file:
-            filename = files.save_file_to_disk(file, save_chapter)
-            save_chapter.filename = filename
-
         if commit:
             save_chapter.save()
 
         return save_chapter
 
+    def save_chapter_contributors(self, chapter):
+        selected_contributors = self.cleaned_data.get('contributors', [])
+        existing_links = models.ContributorLink.objects.filter(chapter=chapter)
+
+        # Remove links for contributors no longer selected
+        existing_links.exclude(
+            contributor__in=selected_contributors,
+        ).delete()
+
+        # Add links for newly selected contributors
+        existing_contributor_ids = set(
+            existing_links.values_list('contributor_id', flat=True)
+        )
+        next_order = (
+            existing_links.order_by('-order').values_list(
+                'order', flat=True,
+            ).first() or 0
+        ) + 1
+
+        for contributor in selected_contributors:
+            if contributor.pk not in existing_contributor_ids:
+                models.ContributorLink.objects.create(
+                    contributor=contributor,
+                    chapter=chapter,
+                    order=next_order,
+                )
+                next_order += 1
+
 
 class DateForm(forms.Form):
     start_date = forms.DateField(widget=DateInput())
@@ -166,3 +245,17 @@ def save(self, commit=True):
             save_category.save()
 
         return save_category
+
+
+class PreprintSelectionForm(forms.Form):
+    preprint_id = forms.ModelChoiceField(
+        queryset=repository_models.Preprint.objects.none(),
+        label="Select a Preprint",
+        required=True,
+    )
+
+    def __init__(self, *args, **kwargs):
+        available_preprints = kwargs.pop('available_preprints', None)
+        super().__init__(*args, **kwargs)
+        if available_preprints is not None:
+            self.fields['preprint_id'].queryset = available_preprints
\ No newline at end of file
diff --git a/hooks.py b/hooks.py
index 9cc57f0..c6a2c0c 100644
--- a/hooks.py
+++ b/hooks.py
@@ -1,10 +1,35 @@
 from django.urls import reverse
+from django.template.loader import render_to_string
+from django.utils.safestring import mark_safe
 
 from utils.function_cache import cache
 
 
+
 @cache(600)
 def nav_hook(context):
     return '<li><a href="{url}"><i class="fa fa-book"></i> Books</a></li>'.format(
         url=reverse('books_admin')
     )
+
+
+def linked_books(context):
+    request = context.get("request")
+    preprint = context.get("preprint")
+
+    if not preprint or not hasattr(preprint, "get_linked_books"):
+        return ""
+
+    theme = getattr(preprint.repository, "theme", "OLH")
+    template_path = f"books/{theme}/repository_linked_books.html"
+
+    books = preprint.get_linked_books()
+
+    return mark_safe(render_to_string(
+        template_path,
+        {
+            "preprint": preprint,
+            "linked_books": books,
+        },
+        request=request,
+    ))
\ No newline at end of file
diff --git a/logic.py b/logic.py
index 036d080..67f1812 100644
--- a/logic.py
+++ b/logic.py
@@ -1,3 +1,5 @@
+import json
+
 from plugins.books import models
 from datetime import date, timedelta, datetime
 from dateutil.relativedelta import relativedelta
@@ -151,10 +153,42 @@ def book_metrics_by_month(books, date_parts):
     return data, dates, current_year, previous_year
 
 
-def get_chapter_contributor_items(book):
-    contributors = models.Contributor.objects.filter(
-        book=book,
+def swap_order(item, direction, queryset, order_field='order'):
+    """Swap an item's order with its neighbour in an ordered queryset."""
+    # Normalize orders to be sequential
+    for index, obj in enumerate(queryset):
+        if getattr(obj, order_field) != index:
+            setattr(obj, order_field, index)
+            obj.save()
+    item.refresh_from_db()
+
+    current_order = getattr(item, order_field)
+
+    if direction == 'up':
+        neighbour = queryset.filter(**{order_field: current_order - 1}).first()
+        if neighbour:
+            setattr(neighbour, order_field, current_order)
+            neighbour.save()
+            setattr(item, order_field, current_order - 1)
+            item.save()
+    elif direction == 'down':
+        neighbour = queryset.filter(**{order_field: current_order + 1}).first()
+        if neighbour:
+            setattr(neighbour, order_field, current_order)
+            neighbour.save()
+            setattr(item, order_field, current_order + 1)
+            item.save()
+
+
+def trigger_message(name, direction):
+    """Build a JSON HX-Trigger-After-Swap header value with proper escaping."""
+    return json.dumps(
+        {"showMessage": {"value": "{} moved {}.".format(name, direction)}}
     )
+
+
+def get_chapter_contributor_items(book):
+    contributors = book.contributors.all()
     items = list()
     items.append({'object': None, 'cells': ['First Name', 'Last Name', 'Email']})
 
diff --git a/management/__init__.py b/management/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/management/commands/__init__.py b/management/commands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/management/commands/generate_random_books.py b/management/commands/generate_random_books.py
new file mode 100644
index 0000000..c35cce1
--- /dev/null
+++ b/management/commands/generate_random_books.py
@@ -0,0 +1,152 @@
+import random
+import string
+import os
+from django.core.management.base import BaseCommand
+from django.utils import timezone
+from django.conf import settings
+from faker import Faker
+import svgwrite
+
+from plugins.books import models as book_models
+
+fake = Faker()
+
+# Define the SVG cover creation path
+COVERS_DIR = os.path.join(settings.MEDIA_ROOT, 'cover_images')
+
+
+class Command(BaseCommand):
+    help = 'Generate a specified number of random Book instances with contributors and chapters.'
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            'num_books',
+            type=int,
+            help='The number of books to generate.',
+        )
+
+    def handle(self, *args, **kwargs):
+        num_books = kwargs['num_books']
+        categories = book_models.Category.objects.all()
+        if not categories:
+            self.stdout.write(self.style.ERROR(
+                "No categories available. Please add categories first."))
+            return
+
+        # Ensure the cover images directory exists
+        os.makedirs(COVERS_DIR, exist_ok=True)
+
+        books_created = []
+        for _ in range(num_books):
+            category = random.choice(categories)
+            title = fake.sentence(nb_words=3).title()
+            subtitle = fake.sentence(nb_words=5).title() if random.choice(
+                [True, False]) else None
+            publisher_name = fake.company()
+            publisher_loc = fake.city()
+
+            # Generate SVG cover
+            cover_filename = f"{title.replace(' ', '_')}_{random.randint(1000, 9999)}.svg"
+            cover_path = os.path.join(COVERS_DIR, cover_filename)
+            self.create_svg_cover(title, cover_path)
+
+            book = book_models.Book.objects.create(
+                title=title,
+                subtitle=subtitle,
+                description=fake.text(max_nb_chars=200),
+                pages=random.randint(100, 500),
+                is_edited_volume=random.choice([True, False]),
+                is_open_access=random.choice([True, False]),
+                date_published=fake.date_this_century(),
+                publisher_name=publisher_name,
+                publisher_loc=publisher_loc,
+                doi=f'10.{random.randint(1000, 9999)}/{random.randint(1000000, 9999999)}',
+                isbn=''.join(random.choices(string.digits, k=13)),
+                purchase_url=fake.url(),
+                license_information=fake.sentence(nb_words=10),
+                cover=f'cover_images/{cover_filename}',
+            )
+            if category:
+                book.categories.add(category)
+
+            # Add random contributors
+            num_contributors = random.randint(2, 10)
+            self.create_contributors(book, num_contributors)
+
+            # Add random chapters
+            num_chapters = random.randint(5, 15)
+            self.create_chapters(book, num_chapters)
+
+            books_created.append(book)
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f'Successfully created {len(books_created)} books with contributors and chapters.')
+        )
+
+    def create_svg_cover(self, title, filepath):
+        # Create an SVG drawing with a black background and the title in white
+        svg = svgwrite.Drawing(filepath, size=("200px", "300px"))
+        svg.add(svg.rect(insert=(0, 0), size=("100%", "100%"), fill="black"))
+
+        # Add title text to the SVG, centered
+        svg.add(
+            svg.text(
+                title,
+                insert=("50%", "50%"),
+                text_anchor="middle",
+                alignment_baseline="middle",
+                fill="white",
+                font_size="20px",
+                font_family="Arial",
+            )
+        )
+        svg.save()
+
+    def create_contributors(self, book, num_contributors):
+        for order in range(1, num_contributors + 1):
+            first_name = fake.first_name()
+            last_name = fake.last_name()
+            middle_name = fake.first_name() if random.choice(
+                [True, False]) else None
+
+            contributor = book_models.Contributor.objects.create(
+                first_name=first_name,
+                middle_name=middle_name,
+                last_name=last_name,
+                affiliation=fake.company(),
+                email=fake.email(),
+            )
+            book_models.ContributorLink.objects.create(
+                contributor=contributor,
+                book=book,
+                order=order,
+            )
+
+    def create_chapters(self, book, num_chapters):
+        for sequence in range(1, num_chapters + 1):
+            title = fake.sentence(nb_words=5).title()
+            description = fake.text(max_nb_chars=200)
+            doi = f'10.{random.randint(1000, 9999)}/{random.randint(100000, 999999)}'
+            pages = random.randint(5, 20)
+
+            chapter = book_models.Chapter.objects.create(
+                book=book,
+                title=title,
+                description=description,
+                pages=pages,
+                doi=doi,
+                number=str(sequence),
+                date_published=fake.date_this_century(),
+                sequence=sequence,
+            )
+
+            # Add contributors to each chapter
+            num_contributors = random.randint(1, 3)
+            chapter_contributors = book.contributors.order_by('?')[:num_contributors]
+            for order, contributor in enumerate(chapter_contributors, start=1):
+                book_models.ContributorLink.objects.create(
+                    contributor=contributor,
+                    chapter=chapter,
+                    order=order,
+                )
diff --git a/migrations/0021_alter_bookaccess_chapter_alter_bookaccess_country_and_more.py b/migrations/0021_alter_bookaccess_chapter_alter_bookaccess_country_and_more.py
new file mode 100644
index 0000000..f9fcc2c
--- /dev/null
+++ b/migrations/0021_alter_bookaccess_chapter_alter_bookaccess_country_and_more.py
@@ -0,0 +1,48 @@
+# Generated by Django 4.2.15 on 2024-11-06 14:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0099_alter_accountrole_options'),
+        ('repository', '0045_historicalrepository_display_public_metrics_and_more'),
+        ('books', '0020_auto_20220823_0931'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bookaccess',
+            name='chapter',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='books.chapter'),
+        ),
+        migrations.AlterField(
+            model_name='bookaccess',
+            name='country',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.country'),
+        ),
+        migrations.AlterField(
+            model_name='bookaccess',
+            name='format',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='books.format'),
+        ),
+        migrations.CreateModel(
+            name='BookPreprint',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('order', models.IntegerField(default=0)),
+                ('book', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='books.book')),
+                ('preprint', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='repository.preprint')),
+            ],
+            options={
+                'ordering': ['order'],
+            },
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='linked_repository_objects',
+            field=models.ManyToManyField(blank=True, help_text='Repository objects linked to this book.', through='books.BookPreprint', to='repository.preprint'),
+        ),
+    ]
diff --git a/migrations/0022_book_peer_reviewed_booksetting_display_review_status.py b/migrations/0022_book_peer_reviewed_booksetting_display_review_status.py
new file mode 100644
index 0000000..28ff323
--- /dev/null
+++ b/migrations/0022_book_peer_reviewed_booksetting_display_review_status.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.15 on 2024-11-13 15:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0021_alter_bookaccess_chapter_alter_bookaccess_country_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='book',
+            name='peer_reviewed',
+            field=models.BooleanField(default=False, help_text='Mark if this book has been peer reviewed.'),
+        ),
+        migrations.AddField(
+            model_name='booksetting',
+            name='display_review_status',
+            field=models.BooleanField(default=False, help_text="Mark this to display a book's review status."),
+        ),
+    ]
diff --git a/migrations/0023_book_edition.py b/migrations/0023_book_edition.py
new file mode 100644
index 0000000..4da6e2c
--- /dev/null
+++ b/migrations/0023_book_edition.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.20 on 2025-07-22 12:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0022_book_peer_reviewed_booksetting_display_review_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='book',
+            name='edition',
+            field=models.CharField(blank=True, null=True),
+        ),
+    ]
diff --git a/migrations/0024_format_display_read_link.py b/migrations/0024_format_display_read_link.py
new file mode 100644
index 0000000..1c50fb7
--- /dev/null
+++ b/migrations/0024_format_display_read_link.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.20 on 2025-07-22 14:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0023_book_edition'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='format',
+            name='display_read_link',
+            field=models.BooleanField(default=True, help_text='For EPUB only, check if you want a Read this Book link'),
+        ),
+    ]
diff --git a/migrations/0025_contributorlink_and_book_contributors.py b/migrations/0025_contributorlink_and_book_contributors.py
new file mode 100644
index 0000000..3c46a02
--- /dev/null
+++ b/migrations/0025_contributorlink_and_book_contributors.py
@@ -0,0 +1,37 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+import core.model_utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0024_format_display_read_link'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ContributorLink',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('order', models.PositiveIntegerField(default=1)),
+                ('contributor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='books.contributor')),
+                ('book', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='books.book')),
+                ('chapter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='books.chapter')),
+            ],
+            options={
+                'ordering': ['order'],
+            },
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='contributors',
+            field=core.model_utils.M2MOrderedThroughField(
+                blank=True,
+                through='books.ContributorLink',
+                through_fields=('book', 'contributor'),
+                to='books.contributor',
+            ),
+        ),
+    ]
diff --git a/migrations/0026_migrate_contributor_data.py b/migrations/0026_migrate_contributor_data.py
new file mode 100644
index 0000000..7be93ed
--- /dev/null
+++ b/migrations/0026_migrate_contributor_data.py
@@ -0,0 +1,54 @@
+from django.db import migrations
+
+
+def forwards(apps, schema_editor):
+    Contributor = apps.get_model('books', 'Contributor')
+    ContributorLink = apps.get_model('books', 'ContributorLink')
+    Chapter = apps.get_model('books', 'Chapter')
+
+    # Book contributors: copy FK relationship into ContributorLink
+    for contributor in Contributor.objects.all():
+        ContributorLink.objects.create(
+            contributor=contributor,
+            book=contributor.book,
+            order=contributor.sequence,
+        )
+
+    # Chapter contributors: copy old M2M into ContributorLink
+    for chapter in Chapter.objects.all():
+        for order, contributor in enumerate(
+            chapter.contributors.all(), start=1
+        ):
+            # Use get_or_create to avoid duplicates if a contributor
+            # is linked to both a book and a chapter
+            ContributorLink.objects.get_or_create(
+                contributor=contributor,
+                chapter=chapter,
+                defaults={'order': order},
+            )
+
+
+def backwards(apps, schema_editor):
+    ContributorLink = apps.get_model('books', 'ContributorLink')
+    Contributor = apps.get_model('books', 'Contributor')
+
+    # Restore Contributor.book FK from ContributorLink book entries
+    for link in ContributorLink.objects.filter(book__isnull=False):
+        contributor = link.contributor
+        contributor.book = link.book
+        contributor.sequence = link.order
+        contributor.save()
+
+    # Chapter M2M will be restored automatically when the field
+    # is reverted to a plain M2M in the reverse schema migration
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0025_contributorlink_and_book_contributors'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards, backwards),
+    ]
diff --git a/migrations/0027_alter_chapter_contributors_remove_contributor_fk.py b/migrations/0027_alter_chapter_contributors_remove_contributor_fk.py
new file mode 100644
index 0000000..77d2ee4
--- /dev/null
+++ b/migrations/0027_alter_chapter_contributors_remove_contributor_fk.py
@@ -0,0 +1,41 @@
+from django.db import migrations, models
+
+import core.model_utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0026_migrate_contributor_data'),
+    ]
+
+    operations = [
+        # Cannot AlterField on M2M to add through=, so remove and re-add.
+        migrations.RemoveField(
+            model_name='chapter',
+            name='contributors',
+        ),
+        migrations.AddField(
+            model_name='chapter',
+            name='contributors',
+            field=core.model_utils.M2MOrderedThroughField(
+                blank=True,
+                through='books.ContributorLink',
+                through_fields=('chapter', 'contributor'),
+                to='books.contributor',
+                related_name='chapter_contributors',
+            ),
+        ),
+        migrations.RemoveField(
+            model_name='contributor',
+            name='book',
+        ),
+        migrations.RemoveField(
+            model_name='contributor',
+            name='sequence',
+        ),
+        migrations.AlterModelOptions(
+            name='contributor',
+            options={'ordering': ('last_name', 'first_name')},
+        ),
+    ]
diff --git a/migrations/0028_book_language_and_notes.py b/migrations/0028_book_language_and_notes.py
new file mode 100644
index 0000000..c0f20a1
--- /dev/null
+++ b/migrations/0028_book_language_and_notes.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.20 on 2026-03-13 15:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0027_alter_chapter_contributors_remove_contributor_fk'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='book',
+            name='language',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='notes',
+            field=models.TextField(blank=True, help_text='Additional notes displayed below the description.', null=True),
+        ),
+    ]
diff --git a/migrations/0029_contributor_bio_and_headshot.py b/migrations/0029_contributor_bio_and_headshot.py
new file mode 100644
index 0000000..ec6ed43
--- /dev/null
+++ b/migrations/0029_contributor_bio_and_headshot.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.20 on 2026-03-13 16:52
+
+import core.file_system
+from django.db import migrations, models
+import plugins.books.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0028_book_language_and_notes'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contributor',
+            name='bio',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='contributor',
+            name='headshot',
+            field=models.FileField(blank=True, null=True, storage=core.file_system.JanewayFileSystemStorage(), upload_to=plugins.books.models.headshot_upload_path),
+        ),
+    ]
diff --git a/migrations/0030_contributor_corporate_author.py b/migrations/0030_contributor_corporate_author.py
new file mode 100644
index 0000000..4404156
--- /dev/null
+++ b/migrations/0030_contributor_corporate_author.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.20 on 2026-03-13 17:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0029_contributor_bio_and_headshot'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contributor',
+            name='corporate_name',
+            field=models.CharField(blank=True, help_text='Full name of the organisation (used when Is Corporate is checked).', max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='contributor',
+            name='is_corporate',
+            field=models.BooleanField(default=False, help_text='Check if this contributor is a corporate/organisational author.'),
+        ),
+        migrations.AlterField(
+            model_name='contributor',
+            name='affiliation',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='contributor',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='contributor',
+            name='last_name',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+    ]
diff --git a/migrations/0031_book_categories_m2m.py b/migrations/0031_book_categories_m2m.py
new file mode 100644
index 0000000..6fcd160
--- /dev/null
+++ b/migrations/0031_book_categories_m2m.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.20 on 2026-03-13 20:43
+
+from django.db import migrations, models
+
+
+def migrate_category_to_categories(apps, schema_editor):
+    Book = apps.get_model('books', 'Book')
+    for book in Book.objects.filter(category__isnull=False):
+        book.categories.add(book.category)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0030_contributor_corporate_author'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='book',
+            name='categories',
+            field=models.ManyToManyField(blank=True, to='books.category'),
+        ),
+        migrations.RunPython(
+            migrate_category_to_categories,
+            migrations.RunPython.noop,
+        ),
+        migrations.RemoveField(
+            model_name='book',
+            name='category',
+        ),
+    ]
diff --git a/migrations/0032_chapter_format.py b/migrations/0032_chapter_format.py
new file mode 100644
index 0000000..562171e
--- /dev/null
+++ b/migrations/0032_chapter_format.py
@@ -0,0 +1,42 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def migrate_chapter_filename(apps, schema_editor):
+    Chapter = apps.get_model('books', 'Chapter')
+    ChapterFormat = apps.get_model('books', 'ChapterFormat')
+    for chapter in Chapter.objects.exclude(filename='').exclude(filename__isnull=True):
+        ChapterFormat.objects.create(
+            chapter=chapter,
+            title='Download',
+            filename=chapter.filename,
+            sequence=10,
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0031_book_categories_m2m'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ChapterFormat',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('filename', models.CharField(max_length=100)),
+                ('sequence', models.PositiveIntegerField(default=10)),
+                ('chapter', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='books.chapter')),
+            ],
+            options={
+                'ordering': ('sequence',),
+            },
+        ),
+        migrations.RunPython(migrate_chapter_filename, migrations.RunPython.noop),
+        migrations.RemoveField(
+            model_name='chapter',
+            name='filename',
+        ),
+    ]
diff --git a/models.py b/models.py
index 7b68f86..0846717 100644
--- a/models.py
+++ b/models.py
@@ -8,11 +8,10 @@
 from user_agents import parse as parse_ua_string
 
 from django.db import models
-from django.conf import settings
-from django.core.files.storage import FileSystemStorage
 from django.core.files.images import get_image_dimensions
 from django.utils import timezone
 from django.core.exceptions import ValidationError
+from django.urls import reverse
 
 from core import models as core_models
 from core.file_system import JanewayFileSystemStorage
@@ -20,11 +19,20 @@
 from metrics.logic import get_iso_country_code
 from utils.shared import get_ip_address
 from plugins.books import files
+from press import models as press_models
 
 
 fs = JanewayFileSystemStorage()
 
 
+def headshot_upload_path(instance, filename):
+    try:
+        filename = str(uuid.uuid4()) + '.' + str(filename.split('.')[1])
+    except IndexError:
+        filename = str(uuid.uuid4())
+    return os.path.join("contributor_headshots/", filename)
+
+
 def cover_images_upload_path(instance, filename):
     try:
         filename = str(uuid.uuid4()) + '.' + str(filename.split('.')[1])
@@ -40,6 +48,10 @@ class BookSetting(models.Model):
         max_length=255,
         default="Published Books",
     )
+    display_review_status = models.BooleanField(
+        default=False,
+        help_text="Mark this to display a book's review status."
+    )
 
     def save(self, *args, **kwargs):
         if not self.pk and BookSetting.objects.exists():
@@ -82,11 +94,9 @@ class Book(models.Model):
     prefix = models.CharField(max_length=20, blank=True, null=True)
     title = models.CharField(max_length=300)
     subtitle = models.CharField(max_length=300, blank=True, null=True)
-    category = models.ForeignKey(
+    categories = models.ManyToManyField(
         Category,
         blank=True,
-        null=True,
-        on_delete=models.SET_NULL,
     )
     description = models.TextField(null=True, blank=True)
     pages = models.PositiveIntegerField(null=True, blank=True)
@@ -143,11 +153,41 @@ class Book(models.Model):
         help_text='Free-text public publisher notes regarding this book',
     )
 
+    language = models.CharField(
+        max_length=100,
+        blank=True,
+        null=True,
+    )
+    notes = models.TextField(
+        blank=True,
+        null=True,
+        help_text='Additional notes displayed below the description.',
+    )
     custom_how_to_cite = models.TextField(
         blank=True, null=True,
         help_text="Custom 'how to cite' text. To be used only if the block"
             " generated by Janeway is not suitable.",
     )
+    linked_repository_objects = models.ManyToManyField(
+        'repository.Preprint',
+        help_text='Repository objects linked to this book.',
+        blank=True,
+        through='BookPreprint'
+    )
+    peer_reviewed = models.BooleanField(
+        default=False,
+        help_text='Mark if this book has been peer reviewed.',
+    )
+    edition = models.CharField(
+        blank=True,
+        null=True,
+    )
+    contributors = M2MOrderedThroughField(
+        'books.Contributor',
+        through='books.ContributorLink',
+        through_fields=('book', 'contributor'),
+        blank=True,
+    )
 
     def __str__(self):
         return self.title
@@ -164,27 +204,20 @@ def citation(self):
         )
       
     def contributors_citation(self):
-        contributors = self.contributor_set.all()
-        contributors_count = contributors.count()
-
-        if contributors_count == 0:
-            return ''
-
-        if contributors_count == 1:
-            return '{contributor} '.format(
-                contributor=contributors[0].citation_name(),
-            )
-
-        if contributors_count == 2:
-            return '{one} & {two} '.format(
-                one=contributors[0].citation_name(),
-                two=contributors[1].citation_name(),
-            )
-
-        return '{contributor} et al. '.format(
-            contributor=contributors[0].citation_name(),
-        )
-
+        contributors = self.contributors.all()
+        if contributors:
+            if contributors.count() == 1:
+                return '{contributor} '.format(
+                    contributor=contributors[0].citation_name()
+                )
+            elif contributors.count() == 2:
+                return '{contributor_one} & {contributor_two} '.format(
+                    contributor_one=contributors[0].citation_name(),
+                    contributor_two=contributors[1].citation_name(),
+                )
+            else:
+                return '{contributor} et al. '.format(contributor=contributors[0])
+        return ''
 
     def full_title(self):
         if self.prefix and self.subtitle:
@@ -197,18 +230,19 @@ def full_title(self):
             return self.title
 
     def first_contributor(self):
-        contributors = self.contributor_set.all()
+        contributors = self.contributors.all()
         if contributors:
             return contributors[0]
         else:
             return 'No Authors'
 
-    def get_next_contributor_sequence(self):
-        if self.contributor_set.all():
-            last_contributor = self.contributor_set.all().reverse()[0]
-            return last_contributor.sequence + 1
-        else:
-            return 1
+    def get_next_contributor_order(self):
+        last_link = ContributorLink.objects.filter(
+            book=self,
+        ).order_by('-order').first()
+        if last_link:
+            return last_link.order + 1
+        return 1
 
     def get_next_chapter_sequence(self):
         chapter_sequences = [c.sequence for c in self.chapter_set.all()]
@@ -257,40 +291,103 @@ def remote_book_label(self):
                 urlparse(self.remote_url).netloc
             )
 
+    @property
+    def press(self):
+        press = press_models.Press.objects.all().first()
+        return press
+
+    def url(self):
+        # Cross Repo/Press URLs are not renderable so we need to
+        # generate this manually. Bad practice but it gets the job done.
+        return "//{press_domain}/plugins/books/{book_id}".format(
+            press_domain=self.press.domain,
+            book_id=self.pk,
+        )
+
+
+class BookPreprint(models.Model):
+    book = models.ForeignKey(Book, on_delete=models.CASCADE)
+    preprint = models.ForeignKey('repository.Preprint', on_delete=models.CASCADE)
+    order = models.IntegerField(default=0)
+
+    class Meta:
+        ordering = ['order']
+
 
 class Contributor(models.Model):
-    book = models.ForeignKey(
-        Book,
-        on_delete=models.CASCADE,
+    is_corporate = models.BooleanField(
+        default=False,
+        help_text='Check if this contributor is a corporate/organisational author.',
     )
-    first_name = models.CharField(max_length=100)
+    corporate_name = models.CharField(
+        max_length=255,
+        blank=True,
+        null=True,
+        help_text='Full name of the organisation (used when Is Corporate is checked).',
+    )
+    first_name = models.CharField(max_length=100, blank=True, null=True)
     middle_name = models.CharField(max_length=100, blank=True, null=True)
-    last_name = models.CharField(max_length=100)
+    last_name = models.CharField(max_length=100, blank=True, null=True)
 
-    affiliation = models.TextField()
+    affiliation = models.TextField(blank=True, null=True)
     email = models.EmailField(blank=True, null=True)
-    sequence = models.PositiveIntegerField(default=10)
+    bio = models.TextField(blank=True, null=True)
+    headshot = models.FileField(
+        upload_to=headshot_upload_path,
+        blank=True,
+        null=True,
+        storage=fs,
+    )
 
     class Meta:
-        ordering = ('sequence',)
+        ordering = ('last_name', 'first_name')
 
     def __str__(self):
-        if not self.middle_name:
-            return "{0} {1}".format(self.first_name, self.last_name)
-        else:
+        if self.is_corporate:
+            return self.corporate_name or ''
+        if self.middle_name:
             return "{0} {1} {2}".format(self.first_name, self.middle_name, self.last_name)
+        return "{0} {1}".format(self.first_name, self.last_name)
 
     def middle_initial(self):
         if self.middle_name:
             return '{middle_initial}.'.format(middle_initial=self.middle_name[0])
 
     def citation_name(self):
+        if self.is_corporate:
+            return self.corporate_name or ''
         return '{last_name} {first_initial}.'.format(
             last_name=self.last_name,
             first_initial=self.first_name[0],
         )
 
 
+class ContributorLink(models.Model):
+    contributor = models.ForeignKey(
+        Contributor,
+        on_delete=models.CASCADE,
+    )
+    book = models.ForeignKey(
+        Book,
+        null=True,
+        blank=True,
+        on_delete=models.CASCADE,
+    )
+    chapter = models.ForeignKey(
+        'Chapter',
+        null=True,
+        blank=True,
+        on_delete=models.CASCADE,
+    )
+    order = models.PositiveIntegerField(default=1)
+
+    class Meta:
+        ordering = ["order"]
+
+    def __str__(self):
+        return "{} - {}".format(self.contributor, self.order)
+
+
 class Format(models.Model):
     book = models.ForeignKey(
         Book,
@@ -300,6 +397,10 @@ class Format(models.Model):
     title = models.CharField(max_length=100)
     filename = models.CharField(max_length=100)
     sequence = models.PositiveIntegerField(default=10)
+    display_read_link = models.BooleanField(
+        default=True,
+        help_text="For EPUB only, check if you want a Read this Book link",
+    )
 
     class Meta:
         ordering = ('sequence',)
@@ -351,6 +452,22 @@ def add_book_access(self, request, access_type='download'):
                 )
 
 
+class ChapterFormat(models.Model):
+    chapter = models.ForeignKey(
+        'Chapter',
+        on_delete=models.CASCADE,
+    )
+    title = models.CharField(max_length=100)
+    filename = models.CharField(max_length=100)
+    sequence = models.PositiveIntegerField(default=10)
+
+    class Meta:
+        ordering = ('sequence',)
+
+    def __str__(self):
+        return self.title
+
+
 def access_choices():
     return (
         ('download', 'Download'),  # A download of any book format
@@ -427,14 +544,13 @@ class Chapter(models.Model):
     sequence = models.PositiveIntegerField(
         help_text='The order in which the chapters should appear.',
     )
-    contributors = models.ManyToManyField(
+    contributors = M2MOrderedThroughField(
         Contributor,
-        null=True,
+        blank=True,
+        through='books.ContributorLink',
+        through_fields=('chapter', 'contributor'),
         related_name='chapter_contributors',
     )
-    filename = models.CharField(
-        max_length=255,
-    )
     license_information = models.TextField(
         blank=True,
         null=True,
@@ -522,17 +638,19 @@ def citation(self):
     def contributors_citation(self):
         contributors = self.contributors.all()
 
-        if contributors.count() == 1:
-            return '{contributor} '.format(
-                contributor=contributors[0].citation_name()
-            )
-        elif contributors.count() == 2:
-            return '{contributor_one} & {contributor_two} '.format(
-                contributor_one=contributors[0].citation_name(),
-                contributor_two=contributors[1].citation_name(),
-            )
-        else:
-            return '{contributor} et al. '.format(contributor=contributors[0])
+        if contributors:
+            if contributors.count() == 1:
+                return '{contributor} '.format(
+                    contributor=contributors[0].citation_name()
+                )
+            elif contributors.count() == 2:
+                return '{contributor_one} & {contributor_two} '.format(
+                    contributor_one=contributors[0].citation_name(),
+                    contributor_two=contributors[1].citation_name(),
+                )
+            else:
+                return '{contributor} et al. '.format(contributor=contributors[0])
+        return ''
 
 
 class KeywordBook(models.Model):
diff --git a/partial_views.py b/partial_views.py
new file mode 100644
index 0000000..89665d1
--- /dev/null
+++ b/partial_views.py
@@ -0,0 +1,154 @@
+from django.shortcuts import render, get_object_or_404
+from django.contrib.admin.views.decorators import staff_member_required
+from django.views.decorators.http import require_POST, require_GET
+
+from plugins.books import models, logic
+
+
+@require_GET
+@staff_member_required
+def contributor_name_fields(request):
+    is_corporate = request.GET.get('is_corporate') == 'on'
+    return render(
+        request,
+        'books/partials/contributor_name_fields.html',
+        {'is_corporate': is_corporate},
+    )
+
+
+@require_POST
+@staff_member_required
+def move_preprint(request, book_id, book_preprint_id, direction):
+    book = get_object_or_404(models.Book, pk=book_id)
+    book_preprint = get_object_or_404(
+        models.BookPreprint, id=book_preprint_id, book=book,
+    )
+    queryset = models.BookPreprint.objects.filter(book=book).order_by('order')
+    logic.swap_order(book_preprint, direction, queryset)
+
+    linked_preprints = models.BookPreprint.objects.filter(
+        book=book,
+    ).order_by('order')
+    return render(
+        request,
+        'books/partials/linked_preprints.html',
+        {'book': book, 'linked_preprints': linked_preprints},
+    )
+
+
+@require_POST
+@staff_member_required
+def remove_preprint(request, book_id, book_preprint_id):
+    book = get_object_or_404(models.Book, pk=book_id)
+    book_preprint = get_object_or_404(
+        models.BookPreprint,
+        id=book_preprint_id,
+        book=book,
+    )
+
+    book_preprint.delete()
+
+    linked_preprints = models.BookPreprint.objects.filter(
+        book=book
+    ).order_by('order')
+
+    return render(
+        request,
+        'books/partials/linked_preprints.html',
+        {'book': book, 'linked_preprints': linked_preprints},
+    )
+
+
+@require_POST
+@staff_member_required
+def move_book_contributor(request, book_id, contributor_link_id, direction):
+    book = get_object_or_404(models.Book, pk=book_id)
+    link = get_object_or_404(
+        models.ContributorLink, id=contributor_link_id, book=book,
+    )
+    queryset = models.ContributorLink.objects.filter(
+        book=book,
+    ).order_by('order')
+    logic.swap_order(link, direction, queryset)
+
+    contributor_links = models.ContributorLink.objects.filter(
+        book=book,
+    ).order_by('order')
+    response = render(
+        request,
+        'books/partials/book_contributors.html',
+        {'book': book, 'contributor_links': contributor_links},
+    )
+    response['HX-Trigger-After-Swap'] = logic.trigger_message(
+        link.contributor, direction,
+    )
+    return response
+
+
+@require_POST
+@staff_member_required
+def move_chapter_contributor(
+    request, book_id, chapter_id, contributor_link_id, direction,
+):
+    book = get_object_or_404(models.Book, pk=book_id)
+    chapter = get_object_or_404(models.Chapter, pk=chapter_id, book=book)
+    link = get_object_or_404(
+        models.ContributorLink, id=contributor_link_id, chapter=chapter,
+    )
+    queryset = models.ContributorLink.objects.filter(
+        chapter=chapter,
+    ).order_by('order')
+    logic.swap_order(link, direction, queryset)
+
+    contributor_links = models.ContributorLink.objects.filter(
+        chapter=chapter,
+    ).order_by('order')
+    response = render(
+        request,
+        'books/partials/chapter_contributors.html',
+        {'book': book, 'chapter': chapter, 'contributor_links': contributor_links},
+    )
+    response['HX-Trigger-After-Swap'] = logic.trigger_message(
+        link.contributor, direction,
+    )
+    return response
+
+
+@require_POST
+@staff_member_required
+def move_format(request, book_id, format_id, direction):
+    book = get_object_or_404(models.Book, pk=book_id)
+    book_format = get_object_or_404(models.Format, pk=format_id, book=book)
+    queryset = models.Format.objects.filter(book=book).order_by('sequence')
+    logic.swap_order(book_format, direction, queryset, order_field='sequence')
+
+    formats = models.Format.objects.filter(book=book).order_by('sequence')
+    response = render(
+        request,
+        'books/partials/book_formats.html',
+        {'book': book, 'formats': formats},
+    )
+    response['HX-Trigger-After-Swap'] = logic.trigger_message(
+        book_format.title, direction,
+    )
+    return response
+
+
+@require_POST
+@staff_member_required
+def move_chapter(request, book_id, chapter_id, direction):
+    book = get_object_or_404(models.Book, pk=book_id)
+    chapter = get_object_or_404(models.Chapter, pk=chapter_id, book=book)
+    queryset = models.Chapter.objects.filter(book=book).order_by('sequence')
+    logic.swap_order(chapter, direction, queryset, order_field='sequence')
+
+    chapters = models.Chapter.objects.filter(book=book).order_by('sequence')
+    response = render(
+        request,
+        'books/partials/book_chapters.html',
+        {'book': book, 'chapters': chapters},
+    )
+    response['HX-Trigger-After-Swap'] = logic.trigger_message(
+        chapter.title, direction,
+    )
+    return response
diff --git a/plugin_settings.py b/plugin_settings.py
index 6cfbf25..1812a5d 100644
--- a/plugin_settings.py
+++ b/plugin_settings.py
@@ -25,6 +25,8 @@ def install():
 
 def hook_registry():
     return {
-        'press_admin_nav_block': {'module': 'plugins.books.hooks', 'function': 'nav_hook'}
+        'press_admin_nav_block': {'module': 'plugins.books.hooks', 'function': 'nav_hook'},
+        'preprint_sidebar': {'module': 'plugins.books.hooks',
+                                  'function': 'linked_books'}
     }
 
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..9efe26c
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+Faker==18.9.0
+svgwrite==1.4.1
\ No newline at end of file
diff --git a/static/books/books.css b/static/books/books.css
new file mode 100644
index 0000000..a72cae4
--- /dev/null
+++ b/static/books/books.css
@@ -0,0 +1,184 @@
+.olh-book {
+
+.book {
+  background-color: #f7f7f7;
+  border-radius: 0.75rem;
+  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  margin-top: 2rem;
+  overflow: hidden;
+}
+
+.book-cover {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.book-info {
+  padding: 2rem;
+}
+
+.category {
+  color: #e6194B;
+  font-size: 0.875rem;
+  font-weight: 600;
+  text-transform: uppercase;
+}
+
+.book-title {
+  color: #1a202c;
+  font-size: 1.5rem;
+  font-weight: 700;
+  margin-top: 0.25rem;
+}
+
+.book-title a {
+  color: #1a202c;
+}
+
+.authors {
+  color: #4a5568;
+  margin-top: 0.5rem;
+  margin-bottom: 0;
+}
+
+.read-button {
+  background-color: #e6194B;
+  color: white;
+  border-radius: 0.375rem;
+  display: inline-flex;
+  align-items: center;
+  margin-top: 1rem;
+}
+
+.read-button:hover {
+  background-color: #c81032;
+}
+
+.section {
+  padding: 1.2rem;
+  border-top: 1px solid #e2e8f0;
+}
+
+.section-title {
+  color: #e6194B;
+  font-size: 1.25rem;
+  font-weight: 600;
+  margin-bottom: 1rem;
+}
+
+.section-content {
+  color: #4a5568;
+}
+
+.label-text {
+  color: #900C3F;
+  font-weight: 600;
+}
+
+.associated-files {
+  margin-top: 1rem;
+}
+
+.associated-files li {
+  margin-bottom: 0.5rem;
+}
+
+.associated-files a {
+  color: #3182ce;
+  display: flex;
+  align-items: center;
+}
+
+.associated-files a:hover {
+  color: #2c5282;
+}
+
+.file-icon {
+  margin-right: 0.5rem;
+}
+
+.description-preview {
+  margin-top: 1rem;
+  max-height: 200px;
+  overflow: hidden;
+}
+
+.expand-description, .collapse-description {
+  display: inline-block;
+  margin-top: 0.5rem;
+  color: #1779ba;
+  text-decoration: underline;
+}
+
+.full-description {
+  margin-top: 1rem;
+}
+
+/* Styles for Chapters and Linked Preprints with fixed two columns and vertical scroll */
+.chapter-list,
+.preprint-list {
+  display: flex;
+  flex-wrap: wrap; /* Allow items to wrap within two columns */
+  overflow-x: hidden; /* Prevent horizontal scrolling */
+  list-style-type: none; /* Remove default list styling */
+  padding: 0; /* Remove padding for clean alignment */
+}
+
+/* Each item takes up 50% width to create two columns */
+.chapter-item,
+.preprint-item {
+  width: 50%; /* Ensure exactly two columns */
+  padding: 0.2rem 0; /* Optional spacing for each item */
+  box-sizing: border-box; /* Include padding in width */
+}
+
+.chapter-item p,
+.preprint-item p {
+  margin-bottom: 0;
+}
+
+/* Scrollbar styling (optional for better UX) */
+.chapter-list::-webkit-scrollbar,
+.preprint-list::-webkit-scrollbar {
+  width: 8px;
+}
+
+.chapter-list::-webkit-scrollbar-thumb,
+.preprint-list::-webkit-scrollbar-thumb {
+  background-color: #c81032; /* Scrollbar thumb color */
+  border-radius: 4px;
+}
+
+.chapter-list::-webkit-scrollbar-track,
+.preprint-list::-webkit-scrollbar-track {
+  background-color: #f1f1f1; /* Scrollbar track color */
+}
+
+/* Section titles */
+.section-title {
+  color: #e6194B;
+  font-size: 1.25rem;
+  font-weight: 600;
+  margin-bottom: 1rem;
+}
+
+.label-text {
+  color: #900C3F;
+  font-weight: 600;
+}
+
+/* Responsive adjustment for smaller screens */
+@media (max-width: 768px) {
+  .chapter-item,
+  .preprint-item {
+    width: 100%; /* Use single column on small screens */
+  }
+  .chapter-list,
+  .preprint-list {
+    max-height: 200px; /* Adjust height for smaller screens */
+  }
+}
+
+
+}
\ No newline at end of file
diff --git a/static/books/onix.xsl b/static/books/onix.xsl
new file mode 100644
index 0000000..575d084
--- /dev/null
+++ b/static/books/onix.xsl
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <!-- Output in HTML format -->
+    <xsl:output method="html" encoding="UTF-8" indent="yes" />
+
+    <!-- Root template -->
+    <xsl:template match="/">
+        <html>
+            <head>
+                <title>ONIX Book Export</title>
+                <style>
+                    body { font-family: Arial, sans-serif; }
+                    h1 { color: #4CAF50; }
+                    .book { border: 1px solid #ddd; padding: 10px; margin: 10px 0; }
+                    .section-title { font-weight: bold; color: #333; }
+                    .contributor { margin-left: 15px; }
+                </style>
+            </head>
+            <body>
+                <h1>ONIX Book Export</h1>
+                <xsl:apply-templates select="ONIXMessage/Product" />
+            </body>
+        </html>
+    </xsl:template>
+
+    <!-- Template for each book -->
+    <xsl:template match="Product">
+        <div class="book">
+            <h2>
+                <xsl:value-of select="DescriptiveDetail/TitleDetail/TitleElement/TitleWithoutPrefix" />
+            </h2>
+
+            <!-- ISBN -->
+            <p class="section-title">ISBN:</p>
+            <p><xsl:value-of select="ProductIdentifier[ProductIDType='15']/IDValue" /></p>
+
+            <!-- Contributors -->
+            <p class="section-title">Contributors:</p>
+            <xsl:for-each select="DescriptiveDetail/Contributor">
+                <div class="contributor">
+                    <strong><xsl:value-of select="NamesBeforeKey" /> <xsl:value-of select="KeyNames" /></strong>
+                    <p>Role: <xsl:value-of select="ContributorRole" /></p>
+                    <p>Bio: <xsl:value-of select="BiographicalNote" /></p>
+                </div>
+            </xsl:for-each>
+
+            <!-- Book Description -->
+            <p class="section-title">Description:</p>
+            <p><xsl:value-of select="CollateralDetail/TextContent/Text" disable-output-escaping="yes" /></p>
+
+            <!-- Publishing Details -->
+            <p class="section-title">Publishing Details:</p>
+            <p>Publisher: <xsl:value-of select="PublishingDetail/Publisher/PublisherName" /></p>
+            <p>Location: <xsl:value-of select="PublishingDetail/CityOfPublication" /></p>
+            <p>Date Published: <xsl:value-of select="PublishingDetail/PublishingDate/Date" /></p>
+        </div>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/templates/books/OLH/book.html b/templates/books/OLH/book.html
new file mode 100644
index 0000000..99fd217
--- /dev/null
+++ b/templates/books/OLH/book.html
@@ -0,0 +1,23 @@
+{% extends "core/base.html" %}
+{% load static %}
+
+{% block title %}{{ book.title }}{% endblock %}
+
+{% block css %}
+  <link href="{% static "books/books.css" %}" rel="stylesheet">
+{% endblock css %}
+
+{% block body %}
+  <section class="content">
+    <div class="row">
+      {% include "books/OLH/breadcrumb.html" %}
+      <div class="olh-book">
+        {% include "books/OLH/book_detail.html" with book=book %}
+      </div>
+    </div>
+  </section>
+{% endblock %}
+
+{% block js %}
+  {% include "books/OLH/read_more.js" %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/books/OLH/book_detail.html b/templates/books/OLH/book_detail.html
new file mode 100644
index 0000000..66e06e9
--- /dev/null
+++ b/templates/books/OLH/book_detail.html
@@ -0,0 +1,90 @@
+{% load static %}
+
+<div class="book">
+  <div class="row">
+    <div class="medium-4 large-3 columns">
+      <a href="{% url 'books_book' book.pk %}">
+        {% if book.cover %}
+          <img src="{{ book.cover.url }}" alt="{{ book.title }} book cover"
+               class="book-cover">
+        {% else %}
+          <img src="{% static 'images/default_cover.jpg' %}"
+               alt="Default book cover" class="book-cover">
+        {% endif %}
+      </a>
+    </div>
+    <div class="medium-8 large-9 columns book-info">
+      {% if book.categories.exists %}
+        <p class="categories">{% for cat in book.categories.all %}<a href="{% url 'books_index_category' cat.slug %}">{{ cat.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+      {% endif %}
+      <h2 class="book-title">
+        <a href="{% url 'books_book' book.pk %}">
+          {{ book.full_title }}
+        </a>
+      </h2>
+      <p class="authors">
+        {% for contributor in book.contributors.all %}{% if contributor.bio or contributor.headshot %}<a data-open="contributor-modal-{{ contributor.pk }}">{{ contributor }}</a>{% else %}{{ contributor }}{% endif %}{% if not forloop.last %}, {% endif %}
+        {% endfor %}
+      </p>
+      <div class="button-group">
+        {% for format in book.format_set.all %}
+          <a href="{% url 'books_download_format' book.pk format.pk %}"
+             class="button read-button">
+            <i class="fa fa-download"></i>&nbsp;
+            Download {{ format.title }}
+          </a>
+          {% if format.is_epub and format.display_read_link %}
+            <a href="{% url 'books_read_epub' book.pk format.pk %}"
+               target="_blank" class="button read-button">
+              <i class="fa fa-book"></i> Read this Book
+            </a>
+          {% endif %}
+        {% endfor %}
+        {% if book.remote_url %}
+          <a href="{{ book.remote_url }}"
+             class="button read-button">
+            {{ book.remote_book_label }}
+            <i class="fi-arrow-right"></i>
+          </a>
+        {% endif %}
+        {% if book.purchase_url %}
+          <a href="{{ book.purchase_url }}" class="button read-button"
+             target="_blank">
+            {% with cat=book.categories.first %}{% if cat %}{{ cat.buy_button_text }}{% else %}Buy this Book{% endif %}{% endwith %}
+            &nbsp;<span class="fa fa-external-link" aria-hidden="true"></span>
+          </a>
+        {% endif %}
+      </div>
+      {% if book.keyword_set.exists %}
+        <div class="keyword-container">
+          <h3 class="section-title">Keywords</h3>
+          <p>{% for keyword in book.keyword_set.all %}
+            {{ keyword.word }}{% endfor %}</p>
+        </div>
+      {% endif %}
+      <div class="description-container">
+        <h3 class="section-title">Description</h3>
+        <div class="description-content" id="description-content">
+          {{ book.description|safe }}
+        </div>
+        <a href="#" class="toggle-description" id="toggle-description">Read
+          more</a>
+      </div>
+      {% if index %}
+        <a class="button read-button" href="{% url "books_book" book.pk %}">
+          View detail&nbsp;<span class="fa fa-arrow-circle-right">&nbsp;</span>
+        </a>
+      {% endif %}
+    </div>
+  </div>
+
+  {% if not books %}
+    {% include "books/OLH/detail.html" %}
+  {% endif %}
+
+  {% with contributors=book.contributors.all %}
+    {% include "books/partials/contributor_modal_olh.html" %}
+  {% endwith %}
+
+</div>
+
diff --git a/templates/books/OLH/breadcrumb.html b/templates/books/OLH/breadcrumb.html
new file mode 100644
index 0000000..d371069
--- /dev/null
+++ b/templates/books/OLH/breadcrumb.html
@@ -0,0 +1,23 @@
+<nav aria-label="Breadcrumb" role="navigation">
+  <ul class="breadcrumbs">
+    <li><a href="{% url 'books_index' %}">Book List</a></li>
+
+    {% if book %}
+      {% for cat in book.categories.all %}
+        <li>
+          <a href="{% url 'books_index_category' category_slug=cat.slug %}">
+            {{ cat.name }}
+          </a>
+        </li>
+      {% endfor %}
+
+      <li>
+        <span>{{ book.full_title }}</span>
+      </li>
+    {% else %}
+      {% if category %}
+        <li><span>{{ category.name }}</span></li>
+      {% endif %}
+    {% endif %}
+  </ul>
+</nav>
diff --git a/templates/books/OLH/detail.html b/templates/books/OLH/detail.html
new file mode 100644
index 0000000..576b017
--- /dev/null
+++ b/templates/books/OLH/detail.html
@@ -0,0 +1,118 @@
+  <div class="medium-4 large-3 columns">
+    <div class="section">
+      <h3 class="section-title">Publication Details</h3>
+      <p><span class="label-text">Published:</span>
+        {{ book.date_published|date:"F j, Y" }}</p>
+      {% if book.edition %}
+        <p><span class="label-text">Edition:</span> {{ book.edition }}
+      </p>
+      {% endif %}
+      <p><span class="label-text">Publisher:</span> {{ book.publisher_name }}
+      </p>
+      <p><span class="label-text">Location:</span> {{ book.publisher_loc }}</p>
+      {% if book.doi %}
+        <p><span class="label-text">DOI:</span> <a href="https://doi.org/{{ book.doi }}">https://doi.org/{{ book.doi }}</a></p>
+      {% endif %}
+      {% if book.isbn %}
+        <p><span class="label-text">ISBN:</span> {{ book.isbn }}</p>
+      {% endif %}
+      {% if book.language %}
+        <p><span class="label-text">Language:</span> {{ book.language }}</p>
+      {% endif %}
+      {% if book.peer_reviewed %}
+        <p><span class="label-text">Peer Review: </span><i class="fa fa-check"> Yes</i>
+      {% endif %}
+      {% if book_settings.display_review_status %}
+        <p>
+        <span class="label-text">
+          Peer Reviewed:
+        </span> {% if book.peer_reviewed %}Yes{% else %}No{% endif %}
+        </p>
+      {% endif %}
+      {% if book.format_set.exists %}
+        {% if book.metrics.views %}
+        <p>
+        <span class="label-text">
+          Views:
+        </span> {{ book.metrics.views }}
+        </p>
+        {% endif %}
+        {% if book.metrics.downloads %}
+        <p>
+        <span class="label-text">
+          Downloads:
+        </span> {{ book.metrics.downloads }}
+        </p>
+        {% endif %}
+      {% endif %}
+      {% if book.license_information %}
+        <p><span
+                class="label-text">License Information:</span> {{ book.license_information|safe }}
+        </p>
+      {% endif %}
+    </div>
+  </div>
+  <div class="medium-8 large-9 columns">
+    {% if book.chapter_set.exists %}
+      <div class="section">
+        <h3 class="section-title">Chapters</h3>
+        <ul class="no-bullet chapter-list">
+          {% for chapter in book.chapter_set.all %}
+            <li class="chapter-item">
+              <a href="{% url 'book_view_chapter' book.id chapter.id %}">
+                {% if chapter.number %}{{ chapter.number }}. {% endif %}{{ chapter.title }}
+              </a>
+              {% if chapter.doi %}
+                <p><span class="label-text">DOI:</span> {{ chapter.doi }}</p>
+              {% endif %}
+            </li>
+          {% endfor %}
+        </ul>
+      </div>
+    {% endif %}
+  </div>
+
+<div class="medium-8 large-9 columns">
+  {% if book.bookpreprint_set.exists %}
+    <div class="section">
+      <h3 class="section-title">Linked Items</h3>
+      <ul class="no-bullet preprint-list">
+        {% for book_preprint in book.bookpreprint_set.all %}
+          <li class="preprint-item">
+            <a href="{{ book_preprint.preprint.url }}">
+              {{ book_preprint.preprint.title }}
+            </a>
+            {% if book_preprint.preprint.preprint_doi %}
+              <p><span
+                      class="label-text">DOI:</span> {{ book_preprint.preprint.preprint_doi }}
+              </p>
+            {% endif %}
+          </li>
+        {% endfor %}
+      </ul>
+    </div>
+  {% endif %}
+  {% if book.notes %}
+    <div class="section">
+      <h3 class="section-title">Notes</h3>
+      {{ book.notes|safe }}
+    </div>
+  {% endif %}
+</div>
+
+
+  <div class="medium-12 large-12 columns">
+    <div class="section">
+      <h3 class="section-title">Citation</h3>
+      <p>{{ book.citation|safe }}</p>
+    </div>
+
+    {% if book.publisher_notes.exists %}
+      <div class="section">
+        <h3 class="section-title">Publisher Notes</h3>
+        {% for note in book.publisher_notes.all %}
+          <p>{{ note.note|safe }}</p>
+        {% endfor %}
+      </div>
+    {% endif %}
+  </div>
\ No newline at end of file
diff --git a/templates/books/OLH/index.html b/templates/books/OLH/index.html
new file mode 100644
index 0000000..35b95bd
--- /dev/null
+++ b/templates/books/OLH/index.html
@@ -0,0 +1,41 @@
+{% extends "core/base.html" %}
+{% load static %}
+
+{% block title %}{% if not category %}Published Books{% else %}
+  {{ category.name }}{% endif %}{% endblock %}
+
+{% block css %}
+  <link href="{% static "books/books.css" %}" rel="stylesheet">
+{% endblock css %}
+
+{% block body %}
+  <section class="content">
+
+    <div class="row">
+      {% include "books/OLH/breadcrumb.html" %}
+      {% if not category %}
+        <h1>{{ book_settings.book_page_title }}</h1>
+      {% else %}
+        {% if category.display_title %}
+          <h1>Category: {{ category.name }}</h1>
+        {% endif %}
+        {{ category.description|safe }}
+        <a href="{% url 'books_index' %}" class="button">< Back to All</a>
+      {% endif %}
+
+      {% for book in books %}
+        <div class="olh-book">
+          {% include "books/OLH/book_detail.html" with book=book index=True %}
+        </div>
+        {% empty %}
+        <p>There are no published books to display.</p>
+      {% endfor %}
+    </div>
+
+  </section>
+
+{% endblock body %}
+
+{% block js %}
+  {% include "books/OLH/read_more.js" %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/books/OLH/read_more.js b/templates/books/OLH/read_more.js
new file mode 100644
index 0000000..643d508
--- /dev/null
+++ b/templates/books/OLH/read_more.js
@@ -0,0 +1,46 @@
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    var toggleButtons = document.querySelectorAll('.toggle-description');
+    var descriptionContents = document.querySelectorAll('.description-content');
+
+    toggleButtons.forEach(function (toggleButton, index) {
+        var descriptionContent = descriptionContents[index];
+        var expanded = false;
+
+        // Apply initial styles
+        descriptionContent.style.maxHeight = '90px';
+        descriptionContent.style.overflow = 'hidden';
+        descriptionContent.style.transition = 'max-height 0.5s ease-out';
+
+        // Defer height measurement to allow fonts/images/layout to load
+        requestAnimationFrame(function () {
+            requestAnimationFrame(function () {
+                var fullHeight = descriptionContent.scrollHeight;
+
+                // Store the full height in a data attribute
+                descriptionContent.dataset.fullHeight = fullHeight + 'px';
+
+                // Hide the toggle button if content is short
+                if (fullHeight <= 90) {
+                    toggleButton.style.display = 'none';
+                }
+            });
+        });
+
+        toggleButton.addEventListener('click', function (e) {
+            e.preventDefault();
+
+            if (expanded) {
+                descriptionContent.style.maxHeight = '90px';
+                toggleButton.textContent = 'Read more';
+            } else {
+                var fullHeight = descriptionContent.dataset.fullHeight || '1000px';
+                descriptionContent.style.maxHeight = fullHeight;
+                toggleButton.textContent = 'Show less';
+            }
+
+            expanded = !expanded;
+        });
+    });
+});
+</script>
diff --git a/templates/books/OLH/repository_linked_books.html b/templates/books/OLH/repository_linked_books.html
new file mode 100644
index 0000000..a5ec710
--- /dev/null
+++ b/templates/books/OLH/repository_linked_books.html
@@ -0,0 +1,12 @@
+{% load fqdn %}
+
+{% if linked_books %}
+  <h2>Linked Books</h2>
+  <ul>
+    {% for book in linked_books %}
+      <li>
+        <a href="{{ book.url }}">{{ book.title }}</a>
+      </li>
+    {% endfor %}
+  </ul>
+{% endif %}
\ No newline at end of file
diff --git a/templates/books/OLH/view_chapter.html b/templates/books/OLH/view_chapter.html
new file mode 100644
index 0000000..6504584
--- /dev/null
+++ b/templates/books/OLH/view_chapter.html
@@ -0,0 +1,129 @@
+{% extends "core/base.html" %}
+{% load static %}
+
+{% block title %}
+  {% if chapter.number %}[{{ chapter.number }}] {% endif %}{{ chapter.title }}
+{% endblock %}
+
+{% block css %}
+  <link href="{% static "books/books.css" %}" rel="stylesheet">
+{% endblock %}
+
+{% block body %}
+  <section class="content">
+    <div class="row">
+      {% include "books/OLH/breadcrumb.html" %}
+      <div class="olh-book">
+        <div class="book">
+          <div class="row">
+            <div class="medium-4 large-3 columns">
+              {% if book.cover %}
+                <img src="{{ book.cover.url }}" alt="{{ book.title }} book cover"
+                     class="book-cover">
+              {% else %}
+                <img src="{% static 'images/default_cover.jpg' %}"
+                     alt="Default book cover" class="book-cover">
+              {% endif %}
+
+              <p>
+                <a class="button read-button" href="{% url 'books_book' book.pk %}">
+                  <i class="fa fa-arrow-left"></i>&nbsp;Back to {{ book.full_title }}
+                </a>
+              </p>
+            </div>
+
+            <div class="medium-8 large-9 columns book-info">
+              {% if book.categories.exists %}
+                <p class="categories">{% for cat in book.categories.all %}<a href="{% url 'books_index_category' cat.slug %}">{{ cat.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+              {% endif %}
+
+              <h2 class="book-title">
+                {% if chapter.number %}{{ chapter.number }}. {% endif %}{{ chapter.title }}
+              </h2>
+
+              {% if chapter.contributors.exists %}
+                <p class="authors">
+                  {% for contributor in chapter.contributors.all %}{% if contributor.bio or contributor.headshot %}<a data-open="contributor-modal-{{ contributor.pk }}">{{ contributor }}</a>{% else %}{{ contributor }}{% endif %}{% if not forloop.last %}, {% endif %}
+                  {% endfor %}
+                </p>
+              {% endif %}
+
+              <p class="chapter-parent">
+                This {% with cat=book.categories.first %}{% if cat %}{{ cat.chapter_name }}{% else %}chapter{% endif %}{% endwith %}
+                is part of: {{ book.citation|safe }}
+              </p>
+
+              <div class="button-group">
+                {% with cat=book.categories.first %}
+                  {% for fmt in chapter.chapterformat_set.all %}
+                    <a href="{% url 'books_download_chapter_format' book.pk chapter.pk fmt.pk %}"
+                       class="button read-button">
+                      <i class="fa fa-download"></i>&nbsp;
+                      Download {% if cat %}{{ cat.chapter_name|capfirst }}{% else %}Chapter{% endif %}{% if chapter.chapterformat_set.count > 1 %}: {{ fmt.title }}{% endif %}
+                    </a>
+                  {% endfor %}
+                {% endwith %}
+              </div>
+
+              {% if chapter.description %}
+                <div class="section">
+                  <h3 class="section-title">Description</h3>
+                  <div class="description-content" id="description-content">
+                    {{ chapter.description|safe }}
+                  </div>
+                  <a href="#" class="toggle-description" id="toggle-description">Read
+                    more</a>
+                </div>
+              {% endif %}
+
+              <div class="section">
+                <h3 class="section-title">Publication Details</h3>
+                <p><span class="label-text">Published:</span>
+                  {{ book.date_published|date:"F j, Y" }}</p>
+                <p><span class="label-text">Publisher:</span> {{ book.publisher_name }}
+                </p>
+                {% if chapter.pages %}
+                  <p><span class="label-text">Pages:</span> {{ chapter.pages }}</p>
+                {% endif %}
+                {% if chapter.doi %}
+                  <p><span class="label-text">DOI:</span> {{ chapter.doi }}</p>
+                {% endif %}
+                {% if chapter.license_information or book.license_information %}
+                  <p><span class="label-text">License Information:</span>
+                    {% if chapter.license_information %}
+                      {{ chapter.license_information|safe }}
+                    {% else %}
+                      {{ book.license_information|safe }}
+                    {% endif %}
+                  </p>
+                {% endif %}
+              </div>
+
+              <div class="section">
+                <h3 class="section-title">Citation</h3>
+                <p>{{ chapter.citation|safe }}</p>
+              </div>
+
+              {% if chapter.publisher_notes.exists %}
+                <div class="section">
+                  <h3 class="section-title">Publisher Notes</h3>
+                  {% for note in chapter.publisher_notes.all %}
+                    <p>{{ note.note|safe }}</p>
+                  {% endfor %}
+                </div>
+              {% endif %}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+{% endblock %}
+
+{% with contributors=chapter.contributors.all %}
+  {% include "books/partials/contributor_modal_olh.html" %}
+{% endwith %}
+
+{% block js %}
+  {% include "books/OLH/read_more.js" %}
+{% endblock %}
diff --git a/templates/books/book_preprint_manager.html b/templates/books/book_preprint_manager.html
new file mode 100644
index 0000000..1d3aa90
--- /dev/null
+++ b/templates/books/book_preprint_manager.html
@@ -0,0 +1,114 @@
+{% extends "admin/core/base.html" %}
+
+{% block title %}Manage Preprints for {{ book.title }}{% endblock %}
+{% block admin-header %}Manage Preprints for {{ book.title }}{% endblock %}
+
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li><a href="{% url 'books_admin' %}">Books Admin</a></li>
+  <li><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></li>
+  <li>Manage Preprints for {{ book.title }}</li>
+{% endblock breadcrumbs %}
+
+{% block css %}
+<script src="https://cdn.jsdelivr.net/npm/htmx.org@1.9.2"></script>
+
+  <style>
+    /* Ensure the list item content is aligned horizontally */
+    .preprint-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0.5rem;
+    }
+
+    /* Ensure the text doesn't push the buttons down */
+    .preprint-title {
+      flex: 1;
+      white-space: wrap; /* Prevent text from wrapping */
+      overflow: hidden;
+      text-overflow: ellipsis; /* Show "..." if the text is too long */
+      margin-right: 1rem; /* Space between text and buttons */
+    }
+
+    /* Adjust button group */
+    .button-group {
+      display: flex;
+      gap: 0.5rem; /* Space between buttons */
+    }
+
+  </style>
+{% endblock %}
+
+{% block body %}
+<div class="box">
+  <div class="row expanded">
+
+    <!-- Linked Preprints Section -->
+    <div class="large-6 medium-6 small-12 columns">
+      <div class="title-area">
+        <h2>Linked Preprints</h2>
+      </div>
+
+      <!-- Include the partial template for the Linked Preprints list -->
+      {% include "books/partials/linked_preprints.html" %}
+    </div>
+
+    <!-- Available Preprints Section -->
+    <div class="large-6 medium-6 small-12 columns">
+      <div class="title-area">
+        <h2>Available Preprints</h2>
+      </div>
+      <table class="table small" id="available-preprints">
+        <thead>
+          <tr>
+            <th>Title</th>
+            <th>Action</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for preprint in available_preprints %}
+          <tr>
+            <td>{{ preprint.title }}</td>
+            <td>
+              <form method="post">
+                {% csrf_token %}
+                <button class="button small"
+                        type="submit"
+                        name="preprint_id"
+                        value="{{ preprint.id }}">
+                  Add
+                </button>
+              </form>
+            </td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+{% endblock %}
+
+{% block js %}
+
+
+  <script>
+    // Toastr notification for successful updates
+    document.addEventListener('htmx:afterRequest', function (event) {
+      if (event.detail.triggerName === 'preprintOrderUpdated') {
+        toastr.success('Preprint order updated successfully!');
+      }
+    });
+  </script>
+  {% include "elements/datatables.html" with target="#available-preprints #linked-preprints" %}
+
+  <script>
+    document.body.addEventListener('htmx:configRequest', function(event) {
+      const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]').value;
+      if (csrfToken) {
+        event.detail.headers['X-CSRFToken'] = csrfToken;
+      }
+    });
+  </script>
+{% endblock js %}
\ No newline at end of file
diff --git a/templates/books/chapter.html b/templates/books/chapter.html
index a9e4941..86e972c 100644
--- a/templates/books/chapter.html
+++ b/templates/books/chapter.html
@@ -5,31 +5,93 @@
 {% block admin-header %}Books Admin{% endblock %}
 
 {% block breadcrumbs %}
-    {{ block.super }}
-    <li><a href="{% url 'books_admin' %}">Books Admin</a></li>
-    <li><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></li>
-    <li>{% if chapter %}Edit Chapter{% else %}Add Chapter{% endif %}</li>
+  {{ block.super }}
+  <li><a href="{% url 'books_admin' %}">Books Admin</a></li>
+  <li><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></li>
+  <li>{% if chapter %}Edit Chapter{% else %}Add Chapter{% endif %}</li>
+{% endblock %}
+
+{% block css %}
+{% include "books/partials/htmx_setup.html" %}
 {% endblock %}
 
 {% block body %}
+  <div class="row expanded">
+  <div class="large-6 small-12 columns">
     <div class="box">
-        <div class="row expanded">
-            <div class="title-area">
-                <h2>{% if chapter %}Edit Chapter{% else %}Add Chapter{% endif %}</h2>
-            </div>
-            <div class="content">
-                <form method="POST" enctype="multipart/form-data">
-                    {% csrf_token %}
-                    {% include "admin/elements/forms/errors.html" %}
-                    {{ form|foundation }}
-                    <div class="row expanded">
-                        <div class="large-12 columns">
-                            {% if chapter.filename %}<p>Current file: <a href="{% url 'books_download_chapter' book.pk chapter.pk %}">{{ chapter.filename }}</a></p>{% endif %}
-                        </div>
-                    </div>
-                    <button class="success button" name="submit">Save</button>
-                </form>
-            </div>
+      <div class="title-area">
+        <h2>{% if chapter %}Edit Chapter{% else %}Add Chapter{% endif %}</h2>
+      <a href="{% url 'books_edit_book' book.pk %}" class="button"><i
+                  class="fa fa-arrow-left">&nbsp;</i>Back</a>
+      </div>
+      <div class="content">
+        <form method="POST" enctype="multipart/form-data">
+          {% csrf_token %}
+          {% include "admin/elements/forms/errors.html" %}
+          {{ form|foundation }}
+          <button class="success button" name="submit">Save</button>
+        </form>
+      </div>
+    </div>
+  </div>
+  {% if chapter %}
+    <div class="large-6 small-12 columns">
+      <div class="box">
+        <div class="title-area">
+          <h2>Chapter Contributors</h2>
+        </div>
+        <div class="content">
+          {% include "books/partials/chapter_contributors.html" %}
+        </div>
+      </div>
+      <div class="box">
+        <div class="title-area">
+          <h2>Chapter Formats</h2>
+          <a href="{% url 'books_new_chapter_format' book.pk chapter.pk %}" class="button"><i class="fa fa-plus">&nbsp;</i>Add Format</a>
+        </div>
+        <div class="content">
+          {% if chapter_formats %}
+            <table class="scroll small">
+              <thead>
+                <tr>
+                  <th>Title</th>
+                  <th>File</th>
+                  <th></th>
+                </tr>
+              </thead>
+              <tbody>
+                {% for fmt in chapter_formats %}
+                  <tr>
+                    <td>{{ fmt.title }}</td>
+                    <td>{{ fmt.filename }}</td>
+                    <td><a href="{% url 'books_edit_chapter_format' book.pk chapter.pk fmt.pk %}" class="button tiny">Edit</a></td>
+                  </tr>
+                {% endfor %}
+              </tbody>
+            </table>
+          {% else %}
+            <p>No formats added yet.</p>
+          {% endif %}
         </div>
+      </div>
+      <div class="box">
+        <div class="title-area">
+          <h2>Delete Chapter</h2>
+        </div>
+        <div class="content">
+          <p>Delete this chapter using the button below. Please not you cannot recover this chapter once you delete it.</p>
+        <form method="POST">
+          {% csrf_token %}
+          <button name="delete" value="{{ chapter.pk }}" class="warning button">Delete chapter</button>
+        </form>
+        </div>
+      </div>
     </div>
+  {% endif %}
+
+
 {% endblock %}
+
+{% block js %}
+{% include "books/partials/htmx_reorder_js.html" %}
+{% endblock js %}
diff --git a/templates/books/edit_book.html b/templates/books/edit_book.html
index eefa429..f0347c7 100644
--- a/templates/books/edit_book.html
+++ b/templates/books/edit_book.html
@@ -10,6 +10,9 @@
     {% if book %}<li>{{ book.title }}</li>{% else %}<li>New Book</li>{% endif %}
 {% endblock %}
 
+{% block css %}
+{% include "books/partials/htmx_setup.html" %}
+{% endblock %}
 
 {% block body %}
     <div class="box">
@@ -32,34 +35,26 @@ <h2>Contributors</h2>
                     {% if book %}<a href="{% url 'books_new_contributor' book.pk %}" class="button"><i class="fa fa-user-plus">&nbsp;</i>Add Contributor</a>{% endif %}
                 </div>
                 <div class="content">
-                    <ul class="list-group">
                     {% if not book %}
-                        <li class="list-group-item list-group-item-danger">Save book before adding contributors.</li>
+                        <ul class="list-group">
+                            <li class="list-group-item list-group-item-danger">Save book before adding contributors.</li>
+                        </ul>
                     {% else %}
-                        {% for cont in book.contributor_set.all %}
-                            <li class="list-group-item"><a href="{% url 'books_edit_contributor' book.pk cont.pk %}">{{ cont }}</a></li>
-                        {% empty %}
-                            <li class="list-group-item list-group-item-info">No contributors</li>
-                        {% endfor %}
+                        {% include "books/partials/book_contributors.html" %}
                     {% endif %}
-                    </ul>
                 </div>
                 <div class="title-area">
                     <h2>Formats</h2>
                     {% if book %}<a href="{% url 'books_new_format' book.pk %}" class="button"><i class="fa fa-book">&nbsp;</i>Add Format</a>{% endif %}
                 </div>
                 <div class="content">
-                    <ul class="list-group">
-                        {% if not book %}
+                    {% if not book %}
+                        <ul class="list-group">
                             <li class="list-group-item list-group-item-danger">Save book before adding formats.</li>
-                        {% else %}
-                            {% for format in book.format_set.all %}
-                                <li class="list-group-item"><a href="{% url 'books_edit_format' book.pk format.pk %}">{{ format }}</a></li>
-                            {% empty %}
-                            <li class="list-group-item list-group-item-info">No formats</li>
-                            {% endfor %}
-                        {% endif %}
-                    </ul>
+                        </ul>
+                    {% else %}
+                        {% include "books/partials/book_formats.html" %}
+                    {% endif %}
                 </div>
                 <div class="title-area">
                     <h2>Chapters</h2>
@@ -68,20 +63,28 @@ <h2>Chapters</h2>
                     {% endif %}
                 </div>
                 <div class="content">
-                    <ul class="list-group">
-                        {% if book %}
-                            {% for chapter in book.chapter_set.all %}
-                                <li class="list-group-item"><a href="{% url 'books_edit_chapter' book.pk chapter.pk %}">{% if chapter.number %}[{{ chapter.number }}]{% endif %} {{ chapter.title }}</a></li>
-                            {% empty %}
-                            <li class="list-group-item list-group-item-info">No chapters</li>
-                            {% endfor %}
-                        {% else %}
+                    {% if not book %}
+                        <ul class="list-group">
                             <li class="list-group-item list-group-item-danger">Save book before adding chapters.</li>
-                        {% endif %}
-                    </ul>
+                        </ul>
+                    {% else %}
+                        {% include "books/partials/book_chapters.html" %}
+                    {% endif %}
+                </div>
+                {% if book %}
+                 <div class="title-area">
+                    <h2>Linked Preprints</h2>
                 </div>
+                <div class="content">
+                  <a href="{% url 'book_preprint_management' book.pk %}">Manage Linked Preprints</a>
+                </div>
+                {% endif %}
             </div>
         </div>
 
     </div>
-{% endblock body %}
\ No newline at end of file
+{% endblock body %}
+
+{% block js %}
+{% include "books/partials/htmx_reorder_js.html" %}
+{% endblock js %}
diff --git a/templates/books/edit_chapter_format.html b/templates/books/edit_chapter_format.html
new file mode 100644
index 0000000..0d90693
--- /dev/null
+++ b/templates/books/edit_chapter_format.html
@@ -0,0 +1,53 @@
+{% extends "admin/core/base.html" %}
+{% load foundation %}
+
+{% block title %}Books Admin{% endblock title %}
+{% block admin-header %}Books Admin{% endblock %}
+
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li><a href="{% url 'books_admin' %}">Books Admin</a></li>
+  <li><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></li>
+  <li><a href="{% url 'books_edit_chapter' book.pk chapter.pk %}">{{ chapter.title }}</a></li>
+  <li>{% if chapter_format %}Edit Format{% else %}Add Format{% endif %}</li>
+{% endblock %}
+
+{% block body %}
+  <div class="row expanded">
+    <div class="large-6 small-12 columns">
+      <div class="box">
+        <div class="title-area">
+          <h2>{% if chapter_format %}Editing {{ chapter_format }}{% else %}Adding Format to {{ chapter.title }}{% endif %}</h2>
+          <a href="{% url 'books_edit_chapter' book.pk chapter.pk %}" class="button"><i class="fa fa-arrow-left">&nbsp;</i>Back</a>
+        </div>
+        <div class="content">
+          {% include "elements/forms/errors.html" %}
+          <form method="POST" enctype="multipart/form-data">
+            {% csrf_token %}
+            {{ form|foundation }}
+            {% if chapter_format.filename %}
+              <div class="large-12 columns">
+                <p>Current File: {{ chapter_format.filename }}</p>
+              </div>
+            {% endif %}
+            <button class="success button" name="submit">Save</button>
+          </form>
+        </div>
+      </div>
+    </div>
+    {% if chapter_format %}
+    <div class="large-6 small-12 columns">
+      <div class="box">
+        <div class="title-area">
+          <h2>Delete Format</h2>
+        </div>
+        <p>Delete this format using the button below. You cannot recover it once deleted.</p>
+        <form method="POST">
+          {% csrf_token %}
+          <button name="delete" value="{{ chapter_format.pk }}" class="warning button">Delete format</button>
+        </form>
+      </div>
+    </div>
+    {% endif %}
+  </div>
+{% endblock %}
diff --git a/templates/books/edit_contributor.html b/templates/books/edit_contributor.html
index a54c597..235c6a8 100644
--- a/templates/books/edit_contributor.html
+++ b/templates/books/edit_contributor.html
@@ -5,26 +5,66 @@
 {% block admin-header %}Books Admin{% endblock %}
 
 {% block breadcrumbs %}
-    {{ block.super }}
-    <li><a href="{% url 'books_admin' %}">Books Admin</a></li>
-    <li><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></li>
-    <li>Edit Contributor</li>
+  {{ block.super }}
+  <li><a href="{% url 'books_admin' %}">Books Admin</a></li>
+  <li><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></li>
+  <li>Edit Contributor</li>
+{% endblock %}
+
+{% block css %}
+{% include "books/partials/htmx_setup.html" %}
 {% endblock %}
 
 {% block body %}
-    <div class="box">
-        <div class="row expanded">
-            <div class="title-area">
-                <h2>{% if contributor %}Editing {{ contributor }}{% else %}Adding Contributor to {{ book }}{% endif %}</h2>
-                <a href="{% url 'books_edit_book' book.pk %}" class="button"><i class="fa fa-arrow-left">&nbsp;</i>Back</a>
+  <div class="row expanded">
+    <div class="large-6 small-12 columns">
+      <div class="box">
+        <div class="title-area">
+          <h2>{% if contributor %}Editing {{ contributor }}{% else %}Adding Contributor
+            to {{ book }}{% endif %}</h2>
+          <a href="{% url 'books_edit_book' book.pk %}" class="button"><i
+                  class="fa fa-arrow-left">&nbsp;</i>Back</a>
+        </div>
+        <div class="content">
+          <form method="POST" enctype="multipart/form-data">
+            {% csrf_token %}
+            <div class="row">
+              <div class="large-12 columns">
+                <label for="id_is_corporate">
+                  {{ form.is_corporate }}
+                  Is Corporate Author
+                </label>
+              </div>
             </div>
-            <div class="content">
-                <form method="POST">
-                    {% csrf_token %}
-                    {{ form|foundation }}
-                    <button class="success button" name="submit">Save</button>
-                </form>
+            <div id="contributor-name-fields"
+                 hx-get="{% url 'books_contributor_name_fields' %}"
+                 hx-trigger="change from:#id_is_corporate"
+                 hx-target="#contributor-name-fields"
+                 hx-include="#id_is_corporate">
+              {% include "books/partials/contributor_name_fields.html" with is_corporate=form.instance.is_corporate %}
             </div>
+            {{ form.affiliation|foundation }}
+            {{ form.email|foundation }}
+            {{ form.bio|foundation }}
+            {{ form.headshot|foundation }}
+            <button class="success button" name="submit">Save</button>
+          </form>
+        </div>
+      </div>
+    </div>
+    {% if contributor %}
+    <div class="large-6 small-12 columns">
+      <div class="box">
+        <div class="title-area">
+          <h2>Delete Contributor</h2>
         </div>
+        <p>Delete this contributor using the button below. Please note you cannot recover this contributor once you delete it.</p>
+        <form method="POST">
+          {% csrf_token %}
+          <button name="delete" value="{{ contributor.pk }}" class="warning button">Delete Contributor</button>
+        </form>
+      </div>
     </div>
+    {% endif %}
+  </div>
 {% endblock %}
diff --git a/templates/books/edit_format.html b/templates/books/edit_format.html
index 73fb3df..e1c6d54 100644
--- a/templates/books/edit_format.html
+++ b/templates/books/edit_format.html
@@ -5,30 +5,53 @@
 {% block admin-header %}Books Admin{% endblock %}
 
 {% block breadcrumbs %}
-    {{ block.super }}
-    <li><a href="{% url 'books_admin' %}">Books Admin</a></li>
-    <li><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></li>
-    <li>Edit Format</li>
+  {{ block.super }}
+  <li><a href="{% url 'books_admin' %}">Books Admin</a></li>
+  <li><a href="{% url 'books_edit_book' book.pk %}">{{ book.title }}</a></li>
+  <li>Edit Format</li>
 {% endblock %}
 
 {% block body %}
-    <div class="box">
-        <div class="row expanded">
-            <div class="title-area">
-                <h2>{% if contributor %}Editing {{ format }}{% else %}Adding Format to {{ book }}{% endif %}</h2>
-                <a href="{% url 'books_edit_book' book.pk %}" class="button"><i class="fa fa-arrow-left">&nbsp;</i>Back</a>
-            </div>
-            <div class="content">
-                {% include "elements/forms/errors.html" %}
-                <form method="POST" enctype="multipart/form-data">
-                    {% csrf_token %}
-                    {{ form|foundation }}
-                    <div class="large-12 columns">
-                        <p>{% if format.filename %}Current File: <a href="{% url 'books_download_format' book.pk format.pk %}"><i class="fa fa-download">&nbsp;</i>{{ format.filename }}</a>{% endif %}</p>
-                    </div>
-                    <button class="success button" name="submit">Save</button>
-                </form>
+  <div class="row expanded">
+    <div class="large-6 small-12 columns">
+      <div class="box">
+        <div class="title-area">
+          <h2>{% if contributor %}Editing {{ format }}{% else %}Adding Format to
+            {{ book }}{% endif %}</h2>
+          <a href="{% url 'books_edit_book' book.pk %}" class="button"><i
+                  class="fa fa-arrow-left">&nbsp;</i>Back</a>
+        </div>
+        <div class="content">
+          {% include "elements/forms/errors.html" %}
+          <form method="POST" enctype="multipart/form-data">
+            {% csrf_token %}
+            {{ form|foundation }}
+            <div class="large-12 columns">
+              <p>{% if format.filename %}Current File:
+                <a href="{% url 'books_download_format' book.pk format.pk %}"><i
+                        class="fa fa-download">&nbsp;</i>{{ format.filename }}
+                </a>{% endif %}
+              </p>
             </div>
+            <button class="success button" name="submit">Save</button>
+          </form>
         </div>
+      </div>
     </div>
+    {% if format %}
+    <div class="large-6 small-12 columns">
+      <div class="box">
+        <div class="title-area">
+          <h2>Delete Format</h2>
+        </div>
+        <p>Delete this format using the button below. Please not you cannot recover this format once you delete it.</p>
+        <form method="POST">
+          {% csrf_token %}
+          <button name="delete" value="{{ format.pk }}" class="warning button">Delete format</button>
+        </form>
+      </div>
+    </div>
+    {% endif %}
+  </div>
+
 {% endblock %}
diff --git a/templates/books/material/book_detail.html b/templates/books/material/book_detail.html
index f2926e7..aacbc0c 100644
--- a/templates/books/material/book_detail.html
+++ b/templates/books/material/book_detail.html
@@ -12,8 +12,8 @@
                 {% include "books/material/oa_header.html" %}
             {% else %}
                 <h2>{% if books %}<a href="{% url 'books_book' book.pk %}">{% endif %}{{ book.full_title }}{% if books %}</a>{% endif %}</h2>
-                <h6><em>{% for contributor in book.contributor_set.all %}{% if not forloop.first and not forloop.last %},
-                {% elif forloop.last and not forloop.first %} & {% endif %}{{ contributor }}{% endfor %}</em></h6>
+                <h6><em>{% for contributor in book.contributors.all %}{% if not forloop.first and not forloop.last %},
+                {% elif forloop.last and not forloop.first %} & {% endif %}{% if contributor.bio or contributor.headshot %}<a class="modal-trigger" href="#contributor-modal-{{ contributor.pk }}">{{ contributor }}</a>{% else %}{{ contributor }}{% endif %}{% endfor %}</em></h6>
             {% endif %}
 
             {% if book.remote_url and book.remote_book_label %}
@@ -26,13 +26,13 @@ <h6><em>{% for contributor in book.contributor_set.all %}{% if not forloop.first
 
             {% if book.purchase_url %}
                 <a href="{{ book.purchase_url }}" class="waves-effect waves-light btn" target="_blank">
-                    {% if book.category %}{{ book.category.buy_button_text }}{% else %}Buy this Book{% endif %}
+                    {% with cat=book.categories.first %}{% if cat %}{{ cat.buy_button_text }}{% else %}Buy this Book{% endif %}{% endwith %}
                     <span class="fa fa-external-link" aria-hidden="true"></span>
                 </a>
             {% endif %}
-            {% if book.category %}
-                <h3>Category</h3>
-                <p><a href="{% url 'books_index_category' book.category.slug %}">{{ book.category.name }}</a></p>
+            {% if book.categories.exists %}
+                <h3>{% if book.categories.count == 1 %}Category{% else %}Categories{% endif %}</h3>
+                <p>{% for cat in book.categories.all %}<a href="{% url 'books_index_category' cat.slug %}">{{ cat.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
             {% endif %}
             <h3>Description</h3>
             {{ book.description|safe }}
@@ -64,6 +64,10 @@ <h4>{{ book.metrics.views }}</h4>
     </div>
 </div>
 
+{% with contributors=book.contributors.all %}
+  {% include "books/partials/contributor_modal_material.html" %}
+{% endwith %}
+
 {% block css %}
 <style>
     th {
diff --git a/templates/books/material/detail.html b/templates/books/material/detail.html
index 3b23a32..8d360eb 100644
--- a/templates/books/material/detail.html
+++ b/templates/books/material/detail.html
@@ -8,9 +8,7 @@ <h3>Details</h3>
             <th>ISBN</th>{% endif %}
         {% if book.doi %}
             <th>DOI</th>{% endif %}
-        {% if chapters %}
-            <th>{% if book.category %}{{ book.category.chapter_name_plural|capfirst }}{% else %}
-                Chapters{% endif %}</th>{% endif %}
+        {% if chapters %}{% with cat=book.categories.first %}<th>{% if cat %}{{ cat.chapter_name_plural|capfirst }}{% else %}Chapters{% endif %}</th>{% endwith %}{% endif %}
     </tr>
     <tr>
         <td>{{ book.date_published }}</td>
@@ -23,6 +21,14 @@ <h3>Details</h3>
         {% if chapters %}
             <td>{{ chapters.count }}</td>{% endif %}
     </tr>
+    {% if book.language %}
+        <tr>
+            <th colspan="100">Language</th>
+        </tr>
+        <tr>
+            <td colspan="100">{{ book.language }}</td>
+        </tr>
+    {% endif %}
     {% if book.license_information %}
         <tr>
             <th colspan="100">License Information</th>
@@ -33,16 +39,18 @@ <h3>Details</h3>
     {% endif %}
     {% if chapters %}
         <tr>
-            <th colspan="100">
-                {% if book.category %}{{ book.category.chapter_name_plural|capfirst }}{% else %}Chapters{% endif %}</th>
+            {% with cat=book.categories.first %}
+            <th colspan="100">{% if cat %}{{ cat.chapter_name_plural|capfirst }}{% else %}Chapters{% endif %}</th>
+            {% endwith %}
         </tr>
         <tr>
             <td colspan="100">
+                {% with cat=book.categories.first %}
                 <p>
                     {{ book.full_title }} has the following
-                    {% if book.category %}{{ book.category.chapter_name_plural }}{% else %}
-                        Chapters{% endif %}
+                    {% if cat %}{{ cat.chapter_name_plural }}{% else %}Chapters{% endif %}
                 </p>
+                {% endwith %}
                 <ul>
                     {% for chapter in chapters %}
                         <li><a href="{% url 'book_view_chapter' book.pk chapter.pk %}">
@@ -55,3 +63,7 @@ <h3>Details</h3>
         </tr>
     {% endif %}
 </table>
+{% if book.notes %}
+    <h3>Notes</h3>
+    {{ book.notes|safe }}
+{% endif %}
diff --git a/templates/books/material/oa_header.html b/templates/books/material/oa_header.html
index eab3e4f..a4435be 100644
--- a/templates/books/material/oa_header.html
+++ b/templates/books/material/oa_header.html
@@ -3,7 +3,7 @@
         <h2>{% if books %}
             <a href="{% url 'books_book' book.pk %}">{% endif %}{{ book.full_title }}
             {% if books %}</a>{% endif %}</h2>
-        <h6><em>{% for contributor in book.contributor_set.all %}{% if not forloop.first and not forloop.last %},
+        <h6><em>{% for contributor in book.contributors.all %}{% if not forloop.first and not forloop.last %},
             {% elif forloop.last and not forloop.first %} & {% endif %}{{ contributor }}{% endfor %}</em></h6>
     </div>
     <div class="col l2">
diff --git a/templates/books/olh/book.html b/templates/books/olh/book.html
deleted file mode 100644
index be5b12d..0000000
--- a/templates/books/olh/book.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "core/base.html" %}
-
-{% block title %}{{ book.title }}{% endblock %}
-
-{% block body %}
-    <section class="content">
-        <div class="row">
-            <div class="box journal">
-                <div class="row">
-                    {% include "books/OLH/book_detail.html" with book=book %}
-                </div>
-            </div>
-        </div>
-    </section>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/books/olh/book_detail.html b/templates/books/olh/book_detail.html
deleted file mode 100644
index 0709e26..0000000
--- a/templates/books/olh/book_detail.html
+++ /dev/null
@@ -1,78 +0,0 @@
-{% load static %}
-{% load i18n %}
-<div class="large-12 columns">
-    <div class="content clearfix">
-        <div class="large-3 columns">
-            <img src="{% if book.cover %}{{ book.cover.url }}{% endif %}" alt="">
-
-            {% if not books %}<p><br /><a class="button" href="{% url 'books_index' %}"><i class="fa fa-arrow-left">&nbsp;</i>Back to Listing</a></p>{% endif %}
-        </div>
-        <div class="{% if books %}large-9 columns{% else %}large-7 columns{% endif %}{% if not books and not book.format_set.exists %} end{% endif %}">
-            {% if book.is_open_access %}
-                {% include "books/oa_header.html" %}
-            {% else %}
-                <h2>{% if books %}<a href="{% url 'books_book' book.pk %}">{% endif %}{{ book.full_title }}{% if books %}</a>{% endif %}</h2>
-            {% endif %}
-
-            <h6><em>{% for contributor in book.contributor_set.all %}{% if not forloop.first and not forloop.last %},
-            {% elif forloop.last and not forloop.first %} & {% endif %}{{ contributor }}{% endfor %}</em></h6>
-
-            {% if book.remote_url and book.remote_book_label %}
-            <a href="{{ book.remote_url }}" class="button">{{ book.remote_book_label }} <span class="fa fa-external-link" aria-hidden="true"></span></a>
-            {% endif %}
-            {% for format in book.format_set.all %}
-                <a href="{% url 'books_download_format' book.pk format.pk %}" class="button"><i class="fa fa-download">&nbsp;</i> Download {{ format.title }}</a>
-                {% if format.is_epub %}<a href="{% url 'books_read_epub' book.pk format.pk %}" target="_blank" class="button"><i class="fa fa-book">&nbsp;</i> Read this Book</a>{% endif %}
-            {% endfor %}
-
-            {% if book.purchase_url %}
-                <a href="{{ book.purchase_url }}" class="button" target="_blank">
-                    {% if book.category %}{{ book.category.buy_button_text }}{% else %}Buy this Book{% endif %}
-                    <span class="fa fa-external-link" aria-hidden="true"></span>
-                </a>
-            {% endif %}
-            <table class="table" style="margin-bottom: 0;">
-                {% if book.category %}
-                <tr>
-                    <th>Category</th>
-                </tr>
-                <tr>
-                    <td><a href="{% url 'books_index_category' book.category.slug %}">{{ book.category.name }}</a></td>
-                </tr>
-                {% endif %}
-                <tr>
-                    <th>Description</th>
-                </tr>
-                <tr>
-                    <td>
-                        {{ book.description|safe }}
-                        {% if books %}
-                        <p>
-                            <a href="{% url 'books_book' book.pk %}">View more detail <i class="fa fa-arrow-right"></i></a>
-                        </p>
-                        {% endif %}
-                    </td>
-                </tr>
-            </table>
-
-            {% with chapters=book.chapter_set.all %}
-                {% if not books %}
-                    {% include "books/OLH/detail.html" %}
-                {% endif %}
-            {% endwith %}
-
-        </div>
-
-        {% if not books and book.format_set.exists %}
-            <div class="large-2 columns">
-                <h3>Book Metrics</h3>
-                <h4>{{ book.metrics.downloads }}</h4>
-                <p>Downloads</p>
-                {% if book.metrics.views %}
-                <h4>{{ book.metrics.views }}</h4>
-                <p>EPUB Views</p>
-                {% endif %}
-            </div>
-        {% endif %}
-    </div>
-</div>
diff --git a/templates/books/olh/detail.html b/templates/books/olh/detail.html
deleted file mode 100644
index 63691b8..0000000
--- a/templates/books/olh/detail.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<ul class="accordion" data-accordion data-allow-all-closed="true">
-    <li class="accordion-item" data-accordion-item>
-        <a href="#" class="accordion-title">Details</a>
-        <div class="accordion-content" data-tab-content>
-            <table class="table small">
-                <tr>
-                    <th>Published</th>
-                    <th>Published By</th>
-                  {% if book.pages %}
-                    <th>Pages</th>
-                  {% endif %}
-                  {% if book.isbn %}
-                    <th>ISBN</th>{% endif %}
-                  {% if book.doi %}
-                    <th>DOI</th>{% endif %}
-                  {% if chapters %}
-                    <th>{% if book.category %}{{ book.category.chapter_name_plural|capfirst }}{% else %}Chapters{% endif %}</th>{% endif %}
-                </tr>
-                <tr>
-                    <td>{{ book.date_published }}</td>
-                    <td>{{ book.publisher_name }}</td>
-                    {% if book.pages %}
-                    <td>{{ book.pages }}</td>
-                    {% endif %}
-                    {% if book.isbn %}
-                        <td>{{ book.isbn }}</td>{% endif %}
-                    {% if book.doi %}
-                        <td>{{ book.doi }}</td>{% endif %}
-                    {% if chapters %}
-                        <td>{{ chapters.count }}</td>{% endif %}
-                </tr>
-                {% if book.license_information %}
-                <tr>
-                    <th colspan="100">License Information</th>
-                </tr>
-                <tr>
-                    <td colspan="100">{{ book.license_information }}</td>
-                </tr>
-                {% endif %}
-                <tr>
-                    <th colspan="100">Citation</th>
-                </tr>
-                <tr>
-                    <td colspan="100">{{ book.citation|safe }}</td>
-                </tr>
-            </table>
-        </div>
-    </li>
-
-    {% if chapters %}
-    <li class="accordion-item" data-accordion-item>
-        <a href="#" class="accordion-title">{% if book.category %}{{ book.category.chapter_name_plural|capfirst }}{% else %}Chapters{% endif %}</a>
-        <div class="accordion-content" data-tab-content>
-            <p>{{ book.full_title }} has the following {% if book.category %}{{ book.category.chapter_name_plural }}{% else %}Chapters{% endif %}:
-            <ul>
-                {% for chapter in chapters %}
-                    <li><a href="{% url 'book_view_chapter' book.pk chapter.pk %}">{% if chapter.number %}
-                        {{ chapter.number }}{% endif %} {{ chapter.title }}</a>
-                    </li>
-                {% endfor %}
-            </ul>
-            </p>
-        </div>
-    </li>
-    {% endif %}
-
-    {% if book.publisher_notes.exists %}
-    <li class="accordion-item" data-accordion-item>
-        <a href="#" class="accordion-title">Publisher Notes</a>
-        <div class="accordion-content" data-tab-content>
-            <p>
-                {{ book.full_title }} has the following notes
-              <ul>
-                {% for note in book.publisher_notes.all %}
-                    <li> {{ note.note |safe }} </li>
-                {% endfor %}
-              </ul>
-            </p>
-        </div>
-    </li>
-    {% endif %}
-</ul>
diff --git a/templates/books/olh/index.html b/templates/books/olh/index.html
deleted file mode 100644
index 3f2166b..0000000
--- a/templates/books/olh/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "core/base.html" %}
-
-{% block title %}{% if not category %}Published Books{% else %}{{ category.name }}{% endif %}{% endblock %}
-
-{% block body %}
-    <section class="content">
-        <div class="row">
-            {% if not category %}
-                <h4>{{ book_settings.book_page_title }}</h4>
-            {% else %}
-                {% if category.display_title %}
-                <h4>Category: {{ category.name }}</h4>
-                {% endif %}
-                {{ category.description|safe }}
-                <a href="{% url 'books_index' %}" class="button">< Back to All</a>
-            {% endif %}
-
-            {% for book in books %}
-                <div class="box journal">
-                        {% include "books/OLH/book_detail.html" with book=book %}
-                    </div>
-                <hr />
-            {% empty %}
-                <p>There are no published books to display.</p>
-            {% endfor %}
-        </div>
-
-    </section>
-
-{% endblock body %}
\ No newline at end of file
diff --git a/templates/books/onix.xml b/templates/books/onix.xml
index bdc650a..864ed65 100644
--- a/templates/books/onix.xml
+++ b/templates/books/onix.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/static/books/onix.xsl"?>
 <ONIXMessage release="3.0">
     <Header>
         <Sender>
@@ -8,76 +9,88 @@
         <Addressee>
             <AddresseeName>{{ request.press.domain }}</AddresseeName>
         </Addressee>
-        <SentDateTime>{% now "Ymd" %}​</SentDateTime>
-        <MessageNote>Export from Janeway​</MessageNote>
+        <SentDateTime>{% now "Ymd" %}</SentDateTime>
+        <MessageNote>Export from Janeway</MessageNote>
     </Header>
+
     {% for book in books %}
     <Product>
         <RecordReference>{{ request.press.name|slugify }}.{% if book.doi %}{{ book.doi }}{% else %}{{ book.pk }}{% endif %}</RecordReference>
-        <NotificationType>03​</NotificationType>
+        <NotificationType>03</NotificationType>
+
         {% if book.isbn %}
-            <ProductIdentifier>
-                <ProductIDType>15</ProductIDType>
-                <IDValue>{{ book.isbn }}</IDValue>
-            </ProductIdentifier>
+        <ProductIdentifier>
+            <ProductIDType>15</ProductIDType>
+            <IDValue>{{ book.isbn }}</IDValue>
+        </ProductIdentifier>
         {% endif %}
+
         <DescriptiveDetail>
             <TitleDetail>
-                 <TitleElement>
-                    <SequenceNumber>1​</SequenceNumber>
-                    <TitleElementLevel>01​</TitleElementLevel>
+                <TitleElement>
+                    <SequenceNumber>1</SequenceNumber>
+                    <TitleElementLevel>01</TitleElementLevel>
                     <TitleWithoutPrefix textcase="01">{{ book.title }}</TitleWithoutPrefix>
-                 </TitleElement>
+                </TitleElement>
             </TitleDetail>
-            {% for contributor in book.contributor_set.all %}
+
+            {% for contributor in book.contributors.all %}
             <Contributor>
                 <SequenceNumber>{{ forloop.counter }}</SequenceNumber>
-                <ContributorRole>A01​</ContributorRole>
+                <ContributorRole>A01</ContributorRole>
                 <NamesBeforeKey>{{ contributor.first_name }}{% if contributor.middle_name %} {{ contributor.middle_initial }}{% endif %}</NamesBeforeKey>
                 <KeyNames>{{ contributor.last_name }}</KeyNames>
-                <BiographicalNote textformat="05">{{ contributor.affiliation|safe }}​</BiographicalNote>
+                <BiographicalNote textformat="05">{{ contributor.affiliation|safe }}</BiographicalNote>
             </Contributor>
             {% endfor %}
+
+            {% if book.pages %}
             <Extent>
-                <ExtentType>00​</ExtentType>
+                <ExtentType>00</ExtentType>
                 <ExtentValue>{{ book.pages }}</ExtentValue>
-                <ExtentUnit>03​</ExtentUnit>
+                <ExtentUnit>03</ExtentUnit>
             </Extent>
+            {% endif %}
         </DescriptiveDetail>
+
         <CollateralDetail>
             <TextContent>
-                <TextType>03​</TextType>
-                <ContentAudience>00​</ContentAudience>
+                <TextType>03</TextType>
+                <ContentAudience>00</ContentAudience>
                 <Text textformat="05">{{ book.description|safe }}</Text>
             </TextContent>
+
+            {% if book.cover %}
             <SupportingResource>
-                <ResourceContentType>01​</ResourceContentType>
-                <ContentAudience>00​</ContentAudience>
-                <ResourceMode>03​</ResourceMode>
+                <ResourceContentType>01</ResourceContentType>
+                <ContentAudience>00</ContentAudience>
+                <ResourceMode>03</ResourceMode>
                 <ResourceVersion>
-                    <ResourceForm>02​</ResourceForm>
+                    <ResourceForm>02</ResourceForm>
                     <ResourceVersionFeature>
-                        <ResourceVersionFeatureType>01​</ResourceVersionFeatureType>
+                        <ResourceVersionFeatureType>01</ResourceVersionFeatureType>
                         <FeatureValue>{{ book.cover_onix_code }}</FeatureValue>
                     </ResourceVersionFeature>
                     <ResourceVersionFeature>
-                        <ResourceVersionFeatureType>02​</ResourceVersionFeatureType>
+                        <ResourceVersionFeatureType>02</ResourceVersionFeatureType>
                         <FeatureValue>{{ book.cover_height }}</FeatureValue>
                     </ResourceVersionFeature>
                     <ResourceVersionFeature>
-                        <ResourceVersionFeatureType>03​</ResourceVersionFeatureType>
+                        <ResourceVersionFeatureType>03</ResourceVersionFeatureType>
                         <FeatureValue>{{ book.cover_width }}</FeatureValue>
                     </ResourceVersionFeature>
-                    <ResourceLink>{{ request.press_base_url }}{{ book.cover.url|urlencode }}​</ResourceLink>
+                    <ResourceLink>{{ request.press_base_url }}{{ book.cover.url|urlencode }}</ResourceLink>
                 </ResourceVersion>
             </SupportingResource>
+            {% endif %}
         </CollateralDetail>
+
         <PublishingDetail>
             <Imprint>
                 <ImprintName>{{ request.press.name }}</ImprintName>
             </Imprint>
             <Publisher>
-                <PublishingRole>01​</PublishingRole>
+                <PublishingRole>01</PublishingRole>
                 <PublisherName>{{ book.publisher_name }}</PublisherName>
             </Publisher>
             <Website>
@@ -85,12 +98,12 @@
                 <WebsiteLink>{{ request.press_base_url }}</WebsiteLink>
             </Website>
             <CityOfPublication>{{ book.publisher_loc }}</CityOfPublication>
-            <PublishingStatus datestamp="{{ book.date_published|date:"Ymd" }}">04​</PublishingStatus>
+            <PublishingStatus datestamp="{{ book.date_published|date:"Ymd" }}">04</PublishingStatus>
             <PublishingDate>
-                <PublishingDateRole>01​</PublishingDateRole>
+                <PublishingDateRole>01</PublishingDateRole>
                 <Date dateformat="00">{{ book.date_published|date:"Ymd" }}</Date>
             </PublishingDate>
         </PublishingDetail>
     </Product>
     {% endfor %}
-</ONIXMessage>
\ No newline at end of file
+</ONIXMessage>
diff --git a/templates/books/partials/book_chapters.html b/templates/books/partials/book_chapters.html
new file mode 100644
index 0000000..37dbe1e
--- /dev/null
+++ b/templates/books/partials/book_chapters.html
@@ -0,0 +1,36 @@
+<ul class="list-group" id="book-chapters">
+  {% csrf_token %}
+  {% for chapter in chapters %}
+  <li class="list-group-item">
+    <div class="reorder-item">
+      <span>
+        <a href="{% url 'books_edit_chapter' book.pk chapter.pk %}">{% if chapter.number %}[{{ chapter.number }}]{% endif %} {{ chapter.title }}</a>
+      </span>
+      <div class="reorder-buttons tiny float-right">
+        {% if not forloop.first %}
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_chapter' book.pk chapter.pk 'up' %}"
+          hx-target="#book-chapters"
+          hx-swap="innerHTML"
+        >
+          Up
+        </button>
+        {% endif %}
+        {% if not forloop.last %}
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_chapter' book.pk chapter.pk 'down' %}"
+          hx-target="#book-chapters"
+          hx-swap="innerHTML"
+        >
+          Down
+        </button>
+        {% endif %}
+      </div>
+    </div>
+  </li>
+  {% empty %}
+  <li class="list-group-item list-group-item-info">No chapters</li>
+  {% endfor %}
+</ul>
diff --git a/templates/books/partials/book_contributors.html b/templates/books/partials/book_contributors.html
new file mode 100644
index 0000000..310650f
--- /dev/null
+++ b/templates/books/partials/book_contributors.html
@@ -0,0 +1,36 @@
+<ul class="list-group" id="book-contributors">
+  {% csrf_token %}
+  {% for link in contributor_links %}
+  <li class="list-group-item">
+    <div class="reorder-item">
+      <span>
+        <a href="{% url 'books_edit_contributor' book.pk link.contributor.pk %}">{{ link.contributor }}</a>
+      </span>
+      <div class="reorder-buttons tiny float-right">
+        {% if not forloop.first %}
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_contributor' book.pk link.id 'up' %}"
+          hx-target="#book-contributors"
+          hx-swap="innerHTML"
+        >
+          Up
+        </button>
+        {% endif %}
+        {% if not forloop.last %}
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_contributor' book.pk link.id 'down' %}"
+          hx-target="#book-contributors"
+          hx-swap="innerHTML"
+        >
+          Down
+        </button>
+        {% endif %}
+      </div>
+    </div>
+  </li>
+  {% empty %}
+  <li class="list-group-item list-group-item-info">No contributors</li>
+  {% endfor %}
+</ul>
diff --git a/templates/books/partials/book_formats.html b/templates/books/partials/book_formats.html
new file mode 100644
index 0000000..392bea3
--- /dev/null
+++ b/templates/books/partials/book_formats.html
@@ -0,0 +1,36 @@
+<ul class="list-group" id="book-formats">
+  {% csrf_token %}
+  {% for format in formats %}
+  <li class="list-group-item">
+    <div class="reorder-item">
+      <span>
+        <a href="{% url 'books_edit_format' book.pk format.pk %}">{{ format }}</a>
+      </span>
+      <div class="reorder-buttons tiny float-right">
+        {% if not forloop.first %}
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_format' book.pk format.pk 'up' %}"
+          hx-target="#book-formats"
+          hx-swap="innerHTML"
+        >
+          Up
+        </button>
+        {% endif %}
+        {% if not forloop.last %}
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_format' book.pk format.pk 'down' %}"
+          hx-target="#book-formats"
+          hx-swap="innerHTML"
+        >
+          Down
+        </button>
+        {% endif %}
+      </div>
+    </div>
+  </li>
+  {% empty %}
+  <li class="list-group-item list-group-item-info">No formats</li>
+  {% endfor %}
+</ul>
diff --git a/templates/books/partials/chapter_contributors.html b/templates/books/partials/chapter_contributors.html
new file mode 100644
index 0000000..6d1adb1
--- /dev/null
+++ b/templates/books/partials/chapter_contributors.html
@@ -0,0 +1,34 @@
+<ul class="list-group" id="chapter-contributors">
+  {% csrf_token %}
+  {% for link in contributor_links %}
+  <li class="list-group-item">
+    <div class="reorder-item">
+      <span>{{ link.contributor }}</span>
+      <div class="reorder-buttons tiny float-right">
+        {% if not forloop.first %}
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_chapter_contributor' book.pk chapter.pk link.id 'up' %}"
+          hx-target="#chapter-contributors"
+          hx-swap="innerHTML"
+        >
+          Up
+        </button>
+        {% endif %}
+        {% if not forloop.last %}
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_chapter_contributor' book.pk chapter.pk link.id 'down' %}"
+          hx-target="#chapter-contributors"
+          hx-swap="innerHTML"
+        >
+          Down
+        </button>
+        {% endif %}
+      </div>
+    </div>
+  </li>
+  {% empty %}
+  <li class="list-group-item list-group-item-info">No contributors assigned to this chapter</li>
+  {% endfor %}
+</ul>
diff --git a/templates/books/partials/contributor_modal_material.html b/templates/books/partials/contributor_modal_material.html
new file mode 100644
index 0000000..b07a894
--- /dev/null
+++ b/templates/books/partials/contributor_modal_material.html
@@ -0,0 +1,19 @@
+{% for contributor in contributors %}
+  {% if contributor.bio or contributor.headshot %}
+    <div id="contributor-modal-{{ contributor.pk }}" class="modal">
+      <div class="modal-content">
+        <h2>{{ contributor }}</h2>
+        {% if contributor.headshot %}
+          <img src="{{ contributor.headshot.url }}" alt="{{ contributor }}"
+               style="max-width: 150px; float: left; margin: 0 1rem 1rem 0;">
+        {% endif %}
+        {% if contributor.affiliation %}
+          <p><em>{{ contributor.affiliation }}</em></p>
+        {% endif %}
+        {% if contributor.bio %}
+          {{ contributor.bio|safe }}
+        {% endif %}
+      </div>
+    </div>
+  {% endif %}
+{% endfor %}
diff --git a/templates/books/partials/contributor_modal_olh.html b/templates/books/partials/contributor_modal_olh.html
new file mode 100644
index 0000000..02cb4a0
--- /dev/null
+++ b/templates/books/partials/contributor_modal_olh.html
@@ -0,0 +1,27 @@
+{% for contributor in contributors %}
+  {% if contributor.bio or contributor.headshot %}
+    <div class="reveal" id="contributor-modal-{{ contributor.pk }}" data-reveal
+         data-animation-in="slide-in-up" data-animation-out="slide-out-down">
+      <div class="card">
+        <div class="card-divider">
+          <h2>{{ contributor }}</h2>
+        </div>
+        <div class="card-section">
+          {% if contributor.headshot %}
+            <img src="{{ contributor.headshot.url }}" alt="{{ contributor }}"
+                 style="max-width: 150px; float: left; margin: 0 1rem 1rem 0;">
+          {% endif %}
+          {% if contributor.affiliation %}
+            <p><em>{{ contributor.affiliation }}</em></p>
+          {% endif %}
+          {% if contributor.bio %}
+            {{ contributor.bio|safe }}
+          {% endif %}
+          <button class="close-button" data-close aria-label="Close" type="button">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      </div>
+    </div>
+  {% endif %}
+{% endfor %}
diff --git a/templates/books/partials/contributor_name_fields.html b/templates/books/partials/contributor_name_fields.html
new file mode 100644
index 0000000..59e52d3
--- /dev/null
+++ b/templates/books/partials/contributor_name_fields.html
@@ -0,0 +1,27 @@
+{% if is_corporate %}
+  <div class="row">
+    <div class="large-12 columns">
+      <label for="id_corporate_name">Corporate Name</label>
+      <input type="text" id="id_corporate_name" name="corporate_name">
+    </div>
+  </div>
+{% else %}
+  <div class="row">
+    <div class="large-12 columns">
+      <label for="id_first_name">First Name</label>
+      <input type="text" id="id_first_name" name="first_name">
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-12 columns">
+      <label for="id_middle_name">Middle Name</label>
+      <input type="text" id="id_middle_name" name="middle_name">
+    </div>
+  </div>
+  <div class="row">
+    <div class="large-12 columns">
+      <label for="id_last_name">Last Name</label>
+      <input type="text" id="id_last_name" name="last_name">
+    </div>
+  </div>
+{% endif %}
diff --git a/templates/books/partials/htmx_reorder_js.html b/templates/books/partials/htmx_reorder_js.html
new file mode 100644
index 0000000..1d1421c
--- /dev/null
+++ b/templates/books/partials/htmx_reorder_js.html
@@ -0,0 +1,19 @@
+<script>
+    document.body.addEventListener('htmx:configRequest', function(event) {
+        const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]').value;
+        if (csrfToken) {
+            event.detail.headers['X-CSRFToken'] = csrfToken;
+        }
+    });
+    toastr.options.preventDuplicates = true;
+    toastr.options.newestOnTop = true;
+    toastr.options.maxOpened = 1;
+    document.body.addEventListener('showMessage', function(event) {
+        toastr.clear();
+        toastr.success(event.detail.value);
+    });
+    document.body.addEventListener('htmx:responseError', function(event) {
+        toastr.clear();
+        toastr.error('Failed to update order.');
+    });
+</script>
diff --git a/templates/books/partials/htmx_setup.html b/templates/books/partials/htmx_setup.html
new file mode 100644
index 0000000..aa34a31
--- /dev/null
+++ b/templates/books/partials/htmx_setup.html
@@ -0,0 +1 @@
+<script src="https://cdn.jsdelivr.net/npm/htmx.org@1.9.2"></script>
diff --git a/templates/books/partials/linked_preprints.html b/templates/books/partials/linked_preprints.html
new file mode 100644
index 0000000..a69b6ff
--- /dev/null
+++ b/templates/books/partials/linked_preprints.html
@@ -0,0 +1,44 @@
+<ul class="list-group" id="linked-preprints">
+  {% csrf_token %}
+  {% for book_preprint in linked_preprints %}
+  <li class="list-group-item" data-preprint-id="{{ book_preprint.id }}">
+    <div class="preprint-item">
+      <span>[{{ book_preprint.order }}] {{ book_preprint.preprint.title }}</span>
+
+      <div class="button-group tiny float-right">
+        <!-- Up Button -->
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_preprint' book.pk book_preprint.id 'up' %}"
+          hx-target="#linked-preprints"
+          hx-swap="innerHTML"
+        >
+          Up
+        </button>
+
+        <!-- Down Button -->
+        <button
+          class="button tiny"
+          hx-post="{% url 'books_move_preprint' book.pk book_preprint.id 'down' %}"
+          hx-target="#linked-preprints"
+          hx-swap="innerHTML"
+        >
+          Down
+        </button>
+
+        <!-- Remove Button -->
+        <button
+          class="button alert tiny"
+          hx-post="{% url 'books_remove_preprint' book.pk book_preprint.id %}"
+          hx-target="#linked-preprints"
+          hx-swap="innerHTML"
+        >
+          Remove
+        </button>
+      </div>
+    </div>
+  </li>
+  {% empty %}
+  <li class="list-group-item">No preprints linked to this book.</li>
+  {% endfor %}
+</ul>
diff --git a/templates/books/view_chapter.html b/templates/books/view_chapter.html
index d4906a6..fc31d83 100644
--- a/templates/books/view_chapter.html
+++ b/templates/books/view_chapter.html
@@ -21,9 +21,10 @@
                     <h2>{{ chapter.title }}</h2>
                     <h3><em>{% for contributor in chapter.contributors.all %}{% if not forloop.first and not forloop.last %},
             {% elif forloop.last and not forloop.first %} & {% endif %}{{ contributor }}{% endfor %}</em></h3>
-                    <p>This {% if book.category %}{{ book.category.chapter_name }}{% else %}chapter{% endif %} is part of: {{ book.citation|safe }}</p>
-                    <a href="{% url 'books_download_chapter' book.pk chapter.pk %}" class="button"><i class="fa fa-download">&nbsp;</i> Download
-                        {% if book.category %}{{ book.category.chapter_name|capfirst }}{% else %}Chapter{% endif %}</a>
+                    {% with cat=book.categories.first %}<p>This {% if cat %}{{ cat.chapter_name }}{% else %}chapter{% endif %} is part of: {{ book.citation|safe }}</p>
+                    {% for fmt in chapter.chapterformat_set.all %}
+                      <a href="{% url 'books_download_chapter_format' book.pk chapter.pk fmt.pk %}" class="button"><i class="fa fa-download">&nbsp;</i> Download {% if cat %}{{ cat.chapter_name|capfirst }}{% else %}Chapter{% endif %}{% if chapter.chapterformat_set.count > 1 %}: {{ fmt.title }}{% endif %}</a>
+                    {% endfor %}{% endwith %}
                     <table class="table" style="margin-bottom: 0;">
                         <tr>
                             <th>Description</th>
diff --git a/urls.py b/urls.py
index 5e4cbfc..97ec202 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,6 @@
 from django.urls import re_path
 
-from plugins.books import views
+from plugins.books import views, partial_views
 
 urlpatterns = [
     re_path(r'^$', views.index, name='books_index'),
@@ -15,6 +15,11 @@
     re_path(r'^(?P<book_id>\d+)/format/(?P<chapter_id>\d+)/download/$',
         views.download_chapter,
         name='books_download_chapter'),
+    re_path(
+        r'^(?P<book_id>\d+)/chapter/(?P<chapter_id>\d+)/format/(?P<chapter_format_id>\d+)/download/$',
+        views.download_chapter_format,
+        name='books_download_chapter_format',
+    ),
 
     re_path(r'^admin/$', views.admin, name='books_admin'),
     re_path(r'^admin/categories/$', views.categories, name='books_categories'),
@@ -33,6 +38,16 @@
     re_path(r'^admin/edit/(?P<book_id>\d+)/chapter/edit/(?P<chapter_id>\d+)/$',
         views.books_chapter,
         name='books_edit_chapter'),
+    re_path(
+        r'^admin/edit/(?P<book_id>\d+)/chapter/(?P<chapter_id>\d+)/format/new/$',
+        views.edit_chapter_format,
+        name='books_new_chapter_format',
+    ),
+    re_path(
+        r'^admin/edit/(?P<book_id>\d+)/chapter/(?P<chapter_id>\d+)/format/(?P<chapter_format_id>\d+)/$',
+        views.edit_chapter_format,
+        name='books_edit_chapter_format',
+    ),
 
     re_path(r'^admin/import/$', views.import_books_upload, name='books_import_books_upload'),
     re_path(r'^admin/import/(?P<uuid>.+)/process/$', views.import_books_process, name='books_import_process'),
@@ -43,4 +58,54 @@
 
     re_path(r'^onix/export/$', views.export_onix_xml, name='books_export_onix_xml'),
     re_path(r'^onix/export/(?P<book_id>\d+)/$', views.export_onix_xml, name='books_export_onix_xml_book'),
+    re_path(
+        r'^admin/(?P<book_id>\d+)/manage-preprints/$',
+        views.book_preprint_management_view,
+        name='book_preprint_management',
+    ),
+
+    # Partial URLs for HTMX
+    re_path(
+        r'^books/(?P<book_id>\d+)/preprint/(?P<book_preprint_id>\d+)/move/(?P<direction>up|down)/$',
+        partial_views.move_preprint,
+        name='books_move_preprint',
+    ),
+    re_path(
+        r'^books/(?P<book_id>\d+)/preprint/(?P<book_preprint_id>\d+)/remove/$',
+        partial_views.remove_preprint,
+        name='books_remove_preprint',
+    ),
+
+    # Contributor name fields toggle
+    re_path(
+        r'^admin/contributor/name-fields/$',
+        partial_views.contributor_name_fields,
+        name='books_contributor_name_fields',
+    ),
+
+    # Contributor reorder
+    re_path(
+        r'^books/(?P<book_id>\d+)/contributor/(?P<contributor_link_id>\d+)/move/(?P<direction>up|down)/$',
+        partial_views.move_book_contributor,
+        name='books_move_contributor',
+    ),
+    re_path(
+        r'^books/(?P<book_id>\d+)/chapter/(?P<chapter_id>\d+)/contributor/(?P<contributor_link_id>\d+)/move/(?P<direction>up|down)/$',
+        partial_views.move_chapter_contributor,
+        name='books_move_chapter_contributor',
+    ),
+
+    # Format reorder
+    re_path(
+        r'^books/(?P<book_id>\d+)/format/(?P<format_id>\d+)/move/(?P<direction>up|down)/$',
+        partial_views.move_format,
+        name='books_move_format',
+    ),
+
+    # Chapter reorder
+    re_path(
+        r'^books/(?P<book_id>\d+)/chapter/(?P<chapter_id>\d+)/move/(?P<direction>up|down)/$',
+        partial_views.move_chapter,
+        name='books_move_chapter',
+    ),
 ]
\ No newline at end of file
diff --git a/views.py b/views.py
index 067fc46..2eca01a 100644
--- a/views.py
+++ b/views.py
@@ -11,7 +11,7 @@
 
 from plugins.books import models, forms, files, logic
 from core import files as core_files
-from utils import setting_handler
+from repository import models as repository_models
 
 
 def index(request, category_slug=None):
@@ -27,7 +27,7 @@ def index(request, category_slug=None):
             models.Category,
             slug=category_slug,
         )
-        books = books.filter(category=category)
+        books = books.filter(categories=category)
 
     template = 'books/{}/index.html'.format(request.press.theme)
     context = {
@@ -49,6 +49,7 @@ def view_book(request, book_id):
     template = 'books/{}/book.html'.format(request.press.theme)
     context = {
         'book': book,
+        'book_settings': models.BookSetting.objects.first(),
     }
 
     return render(request, template, context)
@@ -106,11 +107,39 @@ def download_chapter(request, book_id, chapter_id, mark_download='yes'):
         book=book,
     )
 
+    chapter_format = models.ChapterFormat.objects.filter(chapter=chapter).first()
+    if not chapter_format:
+        raise Http404
+
     if mark_download == 'yes':
         chapter.add_book_access(request, 'download')
 
-    # Handle serving the file here
-    return files.server_chapter_file(chapter)
+    return files.serve_chapter_format_file(chapter_format)
+
+
+def download_chapter_format(request, book_id, chapter_id, chapter_format_id, mark_download='yes'):
+    request.session.save()
+
+    book = get_object_or_404(
+        models.Book,
+        pk=book_id,
+        date_published__isnull=False,
+    )
+    chapter = get_object_or_404(
+        models.Chapter,
+        pk=chapter_id,
+        book=book,
+    )
+    chapter_format = get_object_or_404(
+        models.ChapterFormat,
+        pk=chapter_format_id,
+        chapter=chapter,
+    )
+
+    if mark_download == 'yes':
+        chapter.add_book_access(request, 'download')
+
+    return files.serve_chapter_format_file(chapter_format)
 
 
 @staff_member_required
@@ -142,10 +171,23 @@ def edit_book(request, book_id=None):
 
             return redirect(reverse('books_admin'))
 
+    contributor_links = []
+    formats = []
+    chapters = []
+    if book:
+        contributor_links = models.ContributorLink.objects.filter(
+            book=book,
+        ).order_by('order')
+        formats = models.Format.objects.filter(book=book).order_by('sequence')
+        chapters = models.Chapter.objects.filter(book=book).order_by('sequence')
+
     template = 'books/edit_book.html'
     context = {
         'book': book,
         'form': form,
+        'contributor_links': contributor_links,
+        'formats': formats,
+        'chapters': chapters,
     }
 
     return render(request, template, context)
@@ -157,17 +199,36 @@ def edit_contributor(request, book_id, contributor_id=None):
     book = get_object_or_404(models.Book, pk=book_id)
 
     if contributor_id:
-        contributor = get_object_or_404(models.Contributor, pk=contributor_id, book=book)
+        contributor = get_object_or_404(
+            models.Contributor,
+            pk=contributor_id,
+            contributorlink__book=book,
+        )
 
-    form = forms.ContributorForm(instance=contributor, book=book)
+    form = forms.ContributorForm(instance=contributor)
 
     if request.POST:
-        form = forms.ContributorForm(request.POST, instance=contributor, book=book)
+        if contributor and "delete" in request.POST:
+            contributor.delete()
+            messages.success(request, 'Contributor deleted.')
+            return redirect(
+                reverse(
+                    'books_edit_book',
+                    kwargs={'book_id': book.pk},
+                )
+            )
+        form = forms.ContributorForm(request.POST, request.FILES, instance=contributor)
 
         if form.is_valid():
-            form_contributor = form.save(commit=False)
-            form_contributor.book = book
-            form_contributor.save()
+            form_contributor = form.save()
+
+            if not contributor:
+                # New contributor: create a ContributorLink to the book
+                models.ContributorLink.objects.create(
+                    contributor=form_contributor,
+                    book=book,
+                    order=book.get_next_contributor_order(),
+                )
 
             return redirect(reverse('books_edit_book', kwargs={'book_id': book.pk}))
 
@@ -184,14 +245,31 @@ def edit_contributor(request, book_id, contributor_id=None):
 @staff_member_required
 def edit_format(request, book_id, format_id=None):
     book_format = None
-    book = get_object_or_404(models.Book, pk=book_id)
+    book = get_object_or_404(
+        models.Book,
+        pk=book_id,
+    )
 
     if format_id:
-        book_format = get_object_or_404(models.Format, pk=format_id, book=book)
+        book_format = get_object_or_404(
+            models.Format,
+            pk=format_id,
+            book=book,
+        )
 
     form = forms.FormatForm(instance=book_format)
 
     if request.POST:
+        if book_format and "delete" in request.POST:
+            book_format.delete()
+            messages.success(request, 'Format deleted.')
+            return redirect(
+                reverse(
+                    'books_edit_book',
+                    kwargs={'book_id': book.pk},
+                )
+            )
+
         form = forms.FormatForm(request.POST, request.FILES, instance=book_format)
         if form.is_valid():
             form_format = form.save(commit=False)
@@ -210,6 +288,50 @@ def edit_format(request, book_id, format_id=None):
     return render(request, template, context)
 
 
+@staff_member_required
+def edit_chapter_format(request, book_id, chapter_id, chapter_format_id=None):
+    book = get_object_or_404(models.Book, pk=book_id)
+    chapter = get_object_or_404(models.Chapter, pk=chapter_id, book=book)
+    chapter_format = None
+
+    if chapter_format_id:
+        chapter_format = get_object_or_404(
+            models.ChapterFormat,
+            pk=chapter_format_id,
+            chapter=chapter,
+        )
+
+    form = forms.ChapterFormatForm(instance=chapter_format)
+
+    if request.POST:
+        if chapter_format and 'delete' in request.POST:
+            chapter_format.delete()
+            messages.success(request, 'Chapter format deleted.')
+            return redirect(
+                reverse('books_edit_chapter', kwargs={'book_id': book.pk, 'chapter_id': chapter.pk})
+            )
+
+        form = forms.ChapterFormatForm(request.POST, request.FILES, instance=chapter_format)
+        if form.is_valid():
+            saved_format = form.save(commit=False)
+            saved_format.chapter = chapter
+            saved_format.save()
+            messages.success(request, 'Chapter format saved.')
+            return redirect(
+                reverse('books_edit_chapter', kwargs={'book_id': book.pk, 'chapter_id': chapter.pk})
+            )
+
+    template = 'books/edit_chapter_format.html'
+    context = {
+        'book': book,
+        'chapter': chapter,
+        'chapter_format': chapter_format,
+        'form': form,
+    }
+
+    return render(request, template, context)
+
+
 @staff_member_required
 def import_books_upload(request):
     """
@@ -269,19 +391,26 @@ def import_books_process(request, uuid):
         return redirect(reverse('books_import_preview', kwargs={'uuid': uuid}))
 
 
-@staff_member_required
-def export_onix_xml(request, book_id=None):
-    books = models.Book.objects.all()
-
-    if book_id:
-        books = models.Book.objects.filter(pk=book_id)
+def export_onix_xml(
+    request,
+    book_id=None,
+):
+    # Get the books based on the optional book_id parameter
+    books = models.Book.objects.all() if book_id is None else models.Book.objects.filter(pk=book_id)
 
+    # Use an ONIX-compliant XML template
     template = 'books/onix.xml'
     context = {
         'books': books,
+        'chapters': models.Chapter.objects.filter(book__in=books),
+        'contributors': models.Contributor.objects.filter(contributorlink__book__in=books).distinct(),
     }
 
-    return render(request, template, context)
+    xml_content = render(request, template, context).content
+    return HttpResponse(
+        xml_content,
+        content_type='application/xml',
+    )
 
 
 @staff_member_required
@@ -370,6 +499,16 @@ def books_chapter(request, book_id, chapter_id=None):
     )
 
     if request.POST:
+        if chapter and "delete" in request.POST:
+            chapter.delete()
+            messages.success(request, 'Chapter deleted.')
+            return redirect(
+                reverse(
+                    'books_edit_book',
+                    kwargs={'book_id': book.pk},
+                )
+            )
+
         form = forms.ChapterForm(
             request.POST,
             request.FILES,
@@ -377,8 +516,8 @@ def books_chapter(request, book_id, chapter_id=None):
             items=logic.get_chapter_contributor_items(book),
         )
         if form.is_valid():
-            form.save(book=book)
-            form.save_m2m()
+            saved_chapter = form.save(book=book)
+            form.save_chapter_contributors(saved_chapter)
             messages.add_message(
                 request,
                 messages.SUCCESS,
@@ -392,11 +531,23 @@ def books_chapter(request, book_id, chapter_id=None):
                 )
             )
 
+    contributor_links = []
+    chapter_formats = []
+    if chapter:
+        contributor_links = models.ContributorLink.objects.filter(
+            chapter=chapter,
+        ).order_by('order')
+        chapter_formats = models.ChapterFormat.objects.filter(
+            chapter=chapter,
+        ).order_by('sequence')
+
     template = 'books/chapter.html'
     context = {
         'form': form,
         'book': book,
         'chapter': chapter,
+        'contributor_links': contributor_links,
+        'chapter_formats': chapter_formats,
     }
 
     return render(request, template, context)
@@ -414,6 +565,8 @@ def view_chapter(request, book_id, chapter_id):
     chapter = get_object_or_404(models.Chapter, pk=chapter_id)
 
     template = 'books/view_chapter.html'
+    if request.press.theme == 'OLH':
+        template = 'books/OLH/view_chapter.html'
     context = {
         'book': book,
         'chapter': chapter,
@@ -421,6 +574,7 @@ def view_chapter(request, book_id, chapter_id):
 
     return render(request, template, context)
 
+
 @staff_member_required
 def categories(request, category_id=None):
     """
@@ -474,7 +628,6 @@ def categories(request, category_id=None):
                 )
             )
 
-
     template = 'books/categories.html'
     context = {
         'categories': all_categories,
@@ -482,3 +635,69 @@ def categories(request, category_id=None):
     }
 
     return render(request, template, context)
+
+
+@staff_member_required
+def book_preprint_management_view(
+    request,
+    book_id,
+):
+    """Manage linked preprints for a given book."""
+    book = get_object_or_404(
+        models.Book,
+        id=book_id,
+    )
+
+    # Fetch linked preprints through the BookPreprint model
+    linked_preprints = models.BookPreprint.objects.filter(
+        book=book,
+    ).order_by('order')
+
+    # Fetch available preprints that are not already linked
+    available_preprints = repository_models.Preprint.objects.exclude(
+        id__in=linked_preprints.values_list('preprint_id', flat=True),
+    )
+
+    # Initialize the form for adding a new preprint
+    form = forms.PreprintSelectionForm(
+        request.POST or None,
+        available_preprints=available_preprints,
+    )
+
+    if request.method == 'POST' and 'preprint_id' in request.POST:
+        # Handle linking a new preprint
+        if form.is_valid():
+            preprint = form.cleaned_data['preprint_id']
+
+            # Create a new BookPreprint entry with the next available order
+            max_order = models.BookPreprint.objects.filter(
+                book=book,
+            ).count()
+
+            models.BookPreprint.objects.create(
+                book=book,
+                preprint=preprint,
+                order=max_order,
+            )
+
+            messages.success(
+                request,
+                'Preprint linked to book.',
+            )
+            return redirect(
+                'book_preprint_management',
+                book_id=book.id,
+            )
+
+    context = {
+        'book': book,
+        'linked_preprints': linked_preprints,
+        'available_preprints': available_preprints,
+        'form': form,
+    }
+
+    return render(
+        request,
+        'books/book_preprint_manager.html',
+        context,
+    )
\ No newline at end of file