diff --git a/scipost/templates/scipost/login.html b/scipost/templates/scipost/login.html
index f52e1cc6a656030c50b797c16ff4ea3297aff19b..b7a3a64d5351fc4188fe78886cdfa02bab68a4ec 100644
--- a/scipost/templates/scipost/login.html
+++ b/scipost/templates/scipost/login.html
@@ -2,12 +2,13 @@
 
 {% block pagetitle %}: login{% endblock pagetitle %}
 
-{% block bodysup %}
+
 
 {% load bootstrap %}
 
-<div class="container">
-  <div class="row my-4">
+{% block content %}
+
+<div class="row my-4">
     <div class="col-md-6">
       <h1 class="mb-md-2">Log in to SciPost</h1>
       <form action="{% url 'scipost:login' %}" method="post">
@@ -32,7 +33,6 @@
       <a href="{% url 'scipost:register' %}">registration form</a>.</p>
     </div>
 
-  </div>
 </div>
 
-{% endblock bodysup %}
+{% endblock %}
diff --git a/scipost/templates/scipost/logout.html b/scipost/templates/scipost/logout.html
deleted file mode 100644
index 6a8fd267f1622e40001310a7c4c1b9e9937c2083..0000000000000000000000000000000000000000
--- a/scipost/templates/scipost/logout.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block pagetitle %}: logged out{% endblock pagetitle %}
-
-{% block bodysup %}
-
-<section>
-  <h1>Your are now logged out of SciPost.</h1>
-  <p>Keep contributing!</p>
-</section>
-
-{% endblock bodysup %}
diff --git a/scipost/views.py b/scipost/views.py
index 12bb3a579eca6cc9eb479226cade630f7e0ff9e3..7105455cd2df61bbf7e4afb0fd84033c9e0c7fc2 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -6,6 +6,7 @@ import string
 
 from django.utils import timezone
 from django.shortcuts import get_object_or_404, render
+from django.contrib import messages
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import Group
@@ -892,7 +893,8 @@ def login_view(request):
 
 def logout_view(request):
     logout(request)
-    return render(request, 'scipost/logout.html')
+    messages.success(request, '<h3>Keep contributing!</h3>You are now logged out of SciPost.')
+    return redirect(reverse('scipost:index'))
 
 
 def mark_unavailable_period(request):
diff --git a/submissions/views.py b/submissions/views.py
index 17d6d1b48f841cccefafcae07c29d9c69e56f731..1563cde4a53984ede5fdc382b5f76be786409a72 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -350,12 +350,11 @@ def pool(request):
         to=contributor, accepted=None, deprecated=False)
     consider_assignment_form = ConsiderAssignmentForm()
     recs_to_vote_on = (EICRecommendation.objects.get_for_user_in_pool(request.user)
-                       .filter(eligible_to_vote__in=[contributor])
-                       .exclude(recommendation=-1)
-                       .exclude(recommendation=-2)
-                       .exclude(voted_for__in=[contributor])
-                       .exclude(voted_against__in=[contributor])
-                       .exclude(voted_abstain__in=[contributor])
+                       .filter(eligible_to_vote=contributor)
+                       .exclude(recommendation__in=[-1, -2])
+                       .exclude(voted_for=contributor)
+                       .exclude(voted_against=contributor)
+                       .exclude(voted_abstain=contributor)
                        .exclude(submission__status__in=SUBMISSION_STATUS_VOTING_DEPRECATED))
     rec_vote_form = RecommendationVoteForm()
     remark_form = RemarkForm()
@@ -518,15 +517,17 @@ def volunteer_as_EIC(request, arxiv_identifier_w_vn_nr):
                                    arxiv_identifier_w_vn_nr=arxiv_identifier_w_vn_nr)
     errormessage = None
     if submission.status == 'assignment_failed':
-        errormessage = 'This Submission has failed pre-screening and has been rejected.'
-        context = {'errormessage': errormessage}
-        return render(request, 'submissions/accept_or_decline_assignment_ack.html', context)
+        errormessage = '<h3>Thank you for considering.</h3>'
+        errormessage += 'This Submission has failed pre-screening and has been rejected.'
+        messages.warning(request, errormessage)
+        return redirect(reverse('submissions:pool'))
     if submission.editor_in_charge:
-        errormessage = (submission.editor_in_charge.get_title_display() + ' ' +
-                        submission.editor_in_charge.user.last_name +
-                        ' has already agreed to be Editor-in-charge of this Submission.')
-        context = {'errormessage': errormessage}
-        return render(request, 'submissions/accept_or_decline_assignment_ack.html', context)
+        errormessage = '<h3>Thank you for considering.</h3>'
+        errormessage += (submission.editor_in_charge.get_title_display() + ' ' +
+                         submission.editor_in_charge.user.last_name +
+                         ' has already agreed to be Editor-in-charge of this Submission.')
+        messages.warning(request, errormessage)
+        return redirect(reverse('submissions:pool'))
     contributor = Contributor.objects.get(user=request.user)
     assignment = EditorialAssignment(submission=submission,
                                      to=contributor,
@@ -553,8 +554,9 @@ def volunteer_as_EIC(request, arxiv_identifier_w_vn_nr):
     SubmissionUtils.send_EIC_appointment_email()
     SubmissionUtils.send_author_prescreening_passed_email()
 
-    context = {'assignment': assignment}
-    return render(request, 'submissions/accept_or_decline_assignment_ack.html', context)
+    messages.success(request, 'Thank you for becoming Editor-in-charge of this submission.')
+    return redirect(reverse('submissions:editorial_page',
+                            args=[submission.arxiv_identifier_w_vn_nr]))
 
 
 @login_required