diff --git a/djangocms_versioning/helpers.py b/djangocms_versioning/helpers.py
index af8b4862..82f73eb3 100644
--- a/djangocms_versioning/helpers.py
+++ b/djangocms_versioning/helpers.py
@@ -13,13 +13,12 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.mail import EmailMessage
 from django.db import models
-from django.db.models.sql.where import WhereNode
 from django.template.loader import render_to_string
 from django.utils.encoding import force_str
 
 from . import versionables
 from .conf import EMAIL_NOTIFICATIONS_FAIL_SILENTLY
-from .constants import DRAFT, PUBLISHED
+from .constants import DRAFT
 
 try:
     from djangocms_internalsearch.helpers import emit_content_change
diff --git a/djangocms_versioning/templates/djangocms_versioning/admin/discard_confirmation.html b/djangocms_versioning/templates/djangocms_versioning/admin/discard_confirmation.html
index d01e5e10..5c7188da 100644
--- a/djangocms_versioning/templates/djangocms_versioning/admin/discard_confirmation.html
+++ b/djangocms_versioning/templates/djangocms_versioning/admin/discard_confirmation.html
@@ -1,6 +1,5 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_urls static %}
-{% block title %}{% trans "Discard Confirmation" %}{% endblock %}
 
 {% block extrahead %}
     {{ block.super }}
@@ -12,19 +11,20 @@
 {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %}
 
 {% block content %}
+<h1>{% block title %}{% trans "Discard Confirmation" %}{% endblock %}</h1>
 <p>{% translate "Are you sure you want to discard following version?" %}</p>
 <h3>{{ object_name }}</h3>
 <h4>{% blocktrans %}Version number: {{ version_number }}{% endblocktrans %}</h4>
 <form action="" method="POST">
     {% csrf_token %}
-    <input  class="button confirm-link js-versioning-keep-sideframe"
-            type="submit"
-            name="discard"
-            value="{% translate "Yes, I'm sure" %}">
-    <a href="{{ back_url }}">
-        <input type="button"
-               class="button js-versioning-keep-sideframe"
-               value="{% translate "No, take me back" %}">
-    </a>
+    <div class="submit-row">
+        <input  class="button confirm-link js-versioning-keep-sideframe default"
+                type="submit"
+                name="discard"
+                value="{% translate "Yes, I'm sure" %}">
+        <a href="{{ back_url }}" class="cancel-link js-versioning-keep-sideframe" role="button">
+            {% translate 'No, take me back' %}
+        </a>
+    </div>
 </form>
 {% endblock %}
diff --git a/djangocms_versioning/templates/djangocms_versioning/admin/revert_confirmation.html b/djangocms_versioning/templates/djangocms_versioning/admin/revert_confirmation.html
index d7a18d89..3de7d687 100644
--- a/djangocms_versioning/templates/djangocms_versioning/admin/revert_confirmation.html
+++ b/djangocms_versioning/templates/djangocms_versioning/admin/revert_confirmation.html
@@ -1,6 +1,5 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_urls static %}
-{% block title %}{% translate "Revert Confirmation" %}{% endblock %}
 
 {% block extrahead %}
     {{ block.super }}
@@ -13,6 +12,7 @@
 {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %}
 
 {% block content %}
+<h1>{% block title %}{% translate "Revert Confirmation" %}{% endblock %}</h1>
 <p>
     {% if draft_version %}
     {% translate "Reverting to this version may cause loss of an existing draft version. Please select an option to continue" %}
@@ -24,25 +24,25 @@ <h3>{{ object_name }}</h3>
 <h4>{% blocktrans %}Version number: {{ version_number }}{% endblocktrans %}</h4>
 <form action="" method="POST">
     {% csrf_token %}
-    {% if draft_version %}
-    <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
-            type="submit"
-            name="discard"
-            value="{% translate 'Discard existing draft and Revert' %}">
-    <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
-            name="archive"
-            type="submit"
-            value="{% translate 'Archive existing draft and Revert' %}">
-    {% else %}
-    <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
-            type="submit"
-            name="revert"
-            value="{% translate "Yes, I'm sure" %}">
-    {% endif %}
-    <a href="{{ back_url }}">
-        <input type="button"
-               class="button js-versioning-keep-sideframe"
-               value="{% translate 'No, take me back' %}">
-    </a>
+    <div class="submit-row">
+        {% if draft_version %}
+        <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
+                type="submit"
+                name="discard"
+                value="{% translate 'Discard existing draft and Revert' %}">
+        <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
+                name="archive"
+                type="submit"
+                value="{% translate 'Archive existing draft and Revert' %}">
+        {% else %}
+        <input  class="button revert-button confirm-link js-versioning-keep-sideframe"
+                type="submit"
+                name="revert"
+                value="{% translate "Yes, I'm sure" %}">
+        {% endif %}
+        <a href="{{ back_url }}" class="cancel-link js-versioning-keep-sideframe" role="button">
+            {% translate 'No, take me back' %}
+        </a>
+    </div>
 </form>
 {% endblock %}
diff --git a/djangocms_versioning/templates/djangocms_versioning/admin/unpublish_confirmation.html b/djangocms_versioning/templates/djangocms_versioning/admin/unpublish_confirmation.html
index 275a5231..7a87ab53 100644
--- a/djangocms_versioning/templates/djangocms_versioning/admin/unpublish_confirmation.html
+++ b/djangocms_versioning/templates/djangocms_versioning/admin/unpublish_confirmation.html
@@ -1,6 +1,5 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_urls static %}
-{% block title %}{% translate "Revert Confirmation" %}{% endblock %}
 
 {% block extrahead %}
     {{ block.super }}
@@ -12,6 +11,7 @@
 {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %}
 
 {% block content %}
+<h1>{% block title %}{% translate "Revert Confirmation" %}{% endblock %}</h1>
 <p>{% translate "Unpublishing will remove this version from live. Are you sure you want to unpublish?" %}</p>
 <h3>{{ object_name }}</h3>
 <h4>{% blocktrans %} Version number: {{ version_number }}{% endblocktrans %}</h4>
@@ -22,13 +22,15 @@ <h4>{% blocktrans %} Version number: {{ version_number }}{% endblocktrans %}</h4
 </div>
 <form action="" method="POST">
     {% csrf_token %}
-    <input  class="button confirm-link js-versioning-keep-sideframe"
-            type="submit"
-            value="{% translate "Yes, I'm sure" %}">
-    <a href="{{ back_url }}">
-        <input type="button"
-               class="button js-versioning-keep-sideframe"
-               value="{% translate 'No, take me back' %}">
-    </a>
+    <div class="submit-row">
+        <input  class="button confirm-link js-versioning-keep-sideframe"
+                type="submit"
+                value="{% translate "Yes, I'm sure" %}">
+        <a href="{{ back_url }}">
+            <input type="button"
+                   class="button js-versioning-keep-sideframe"
+                   value="{% translate 'No, take me back' %}">
+        </a>
+    </div>
 </form>
 {% endblock %}
diff --git a/tests/test_models.py b/tests/test_models.py
index 5555f075..98ac5b3e 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -7,7 +7,6 @@
 
 from djangocms_versioning.constants import DRAFT, PUBLISHED
 from djangocms_versioning.datastructures import VersionableItem, default_copy
-from djangocms_versioning.helpers import remove_published_where
 from djangocms_versioning.models import Version, VersionQuerySet
 from djangocms_versioning.test_utils import factories
 from djangocms_versioning.test_utils.polls.cms_config import PollsCMSConfig
@@ -244,11 +243,11 @@ def test_get_for_content(self):
         version = factories.PollVersionFactory()
         self.assertEqual(Version.objects.get_for_content(version.content), version)
 
-    def test_versioned_queryset_return_full_with_helper_method(self):
+    def test_versioned_admin_manager(self):
         """With an extra helper method we can return the full queryset"""
         factories.PollVersionFactory()
         normal_count = PollContent.objects.all()
-        full_count = remove_published_where(PollContent.objects.all())
+        full_count = PollContent.admin_manager.all()
 
         self.assertEqual(normal_count.count(), 0)
         self.assertEqual(full_count.count(), 1)