diff --git a/basetheme_bootstrap/static/css/basetheme_bootstrap.css b/basetheme_bootstrap/static/css/basetheme_bootstrap.css
index 6c3603f8f0c8fdf3f1016ba6c292d86b75d473d3..babdb3c19cfe315c05672fdd140679b682e8a35a 100644
--- a/basetheme_bootstrap/static/css/basetheme_bootstrap.css
+++ b/basetheme_bootstrap/static/css/basetheme_bootstrap.css
@@ -52,4 +52,10 @@
 
 .pull-right + .pull-right{
 margin-right:4px;
+}
+.content-page-title>*:first-child{
+    flex-grow: 1;
+}
+.content-page-title{
+    display:flex;
 }
\ No newline at end of file
diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html b/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
index 5c8efaef2e4203c22c281b4eb22218cf64afb9cb..24934bf056f689b7ef886cd941d575bd684a9528 100644
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
@@ -77,8 +77,9 @@
             {% block whole_content_page_title %}
             <div class="pb-2 mt-4 mb-2 col-12">
                 {% block content_page_title %}
-                <div class="border-bottom">
+                <div class="border-bottom content-page-title">
                     <h1>{% block page_title %}{% endblock %}</h1>
+                    {% block page_title_right %}{% endblock %}
                 </div>
                 {% endblock %}
             </div>
diff --git a/setup.py b/setup.py
index 0702fd5ae6e534a4f9c3bb25fbf7d573907288f0..119835465ba82d7c84d24f948474c08e181ae860 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
 
 setup(
     name='django-basetheme-bootstrap',
-    version='0.0.6',
+    version='0.0.7',
     description='Django Basetheme Bootstrap',
     long_description=readme,
     author='Bryan Brancotte',