diff --git a/Dockerfile b/Dockerfile
index a2ead1f4f..39c9ecc35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,7 +88,8 @@ RUN cd /app/ledgergw/static/common; npm install
 RUN python manage_ledgergw.py collectstatic --noinput
 # RUN service rsyslog start
 USER root 
-RUN  rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/*
+# RUN  rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/*
+RUN rm -rf /tmp/* /var/tmp/*
 USER oim
 
 EXPOSE 8080
diff --git a/ledger/accounts/admin.py b/ledger/accounts/admin.py
index bb901681b..b25a6df7d 100755
--- a/ledger/accounts/admin.py
+++ b/ledger/accounts/admin.py
@@ -10,10 +10,9 @@
 from ledger.accounts.models import EmailUser,EmailUserAction, UserAction, EmailUserChangeLog, Document, PrivateDocument, Address, Profile, Organisation, OrganisationAddress 
 from ledger.accounts.forms import ProfileAdminForm
 
-
 @admin.register(EmailUser)
 class EmailUserAdmin(UserAdmin):
-    change_list_template = "ledger/accounts/change_emailuser_list.html"
+    # change_list_template = "ledger/accounts/change_emailuser_list.html" # (disabled due to breaking styling in django admin)
 
     raw_id_fields=('identification','identification2','senior_card','senior_card2','residential_address','postal_address','billing_address',)
 
diff --git a/ledger/accounts/templates/ledger/accounts/account_change.html b/ledger/accounts/templates/ledger/accounts/account_change.html
index 51b8d6597..030259c15 100644
--- a/ledger/accounts/templates/ledger/accounts/account_change.html
+++ b/ledger/accounts/templates/ledger/accounts/account_change.html
@@ -15,7 +15,7 @@
 
 
 <BR>
-
+<div class="container">
 <div class="card">
     <h2 class="card-header">
         <div class='row'>
@@ -61,6 +61,7 @@ <h2 class="card-header">Change Log</h2>
             </div>
   </div>
   </div>
+  </div>
   <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>    
   <style>
   
diff --git a/ledger/accounts/templates/ledger/accounts/account_create.html b/ledger/accounts/templates/ledger/accounts/account_create.html
index 97cf4cead..4ca8b38e4 100644
--- a/ledger/accounts/templates/ledger/accounts/account_create.html
+++ b/ledger/accounts/templates/ledger/accounts/account_create.html
@@ -15,6 +15,7 @@
 
 
 <BR>
+<div class="container">
 
 <div class="card">
     <h2 class="card-header">
@@ -28,7 +29,7 @@ <h2 class="card-header">
     </div>
     
 </div>
-
+</div>
 
 
 </body>
diff --git a/ledger/accounts/templates/ledger/accounts/account_management.html b/ledger/accounts/templates/ledger/accounts/account_management.html
index 990e14bc1..02121a6a1 100644
--- a/ledger/accounts/templates/ledger/accounts/account_management.html
+++ b/ledger/accounts/templates/ledger/accounts/account_management.html
@@ -9,7 +9,7 @@
 
 <BR>
 
-
+<div class="container">
 <div class="card">
   <h2 class="card-header">Account Management</h2>
   <div class="card-body">
@@ -62,7 +62,7 @@ <h2 class="card-header">Account Management</h2>
           </div>
 </div>
 </div>
-
+</div>
 <style>
 
 div.dt-processing div:last-child {
diff --git a/ledger/accounts/templates/ledger/accounts/change_emailuser_list.html b/ledger/accounts/templates/ledger/accounts/change_emailuser_list.html
index 23d38a2ab..ac4c047ff 100755
--- a/ledger/accounts/templates/ledger/accounts/change_emailuser_list.html
+++ b/ledger/accounts/templates/ledger/accounts/change_emailuser_list.html
@@ -21,6 +21,7 @@
 {% block extrahead %}
 {{ block.super }}
 {{ media.js }}
+
 {% if action_form %}{% if actions_on_top or actions_on_bottom %}
 <script type="text/javascript">
 (function($) {
diff --git a/ledger/widgets.py b/ledger/widgets.py
index 25fd42fde..a88aea293 100644
--- a/ledger/widgets.py
+++ b/ledger/widgets.py
@@ -158,7 +158,7 @@ class AjaxFileUploader(FileInput):
     initial_text = ugettext_lazy('Currently testing')
     input_text = ugettext_lazy('Change')
     clear_checkbox_label = ugettext_lazy('Clear')
-
+    template_name = ''
     template_with_initial = (
         '%(initial_text)s: <a href="%(initial_url)s">%(initial)s</a>'
         '%(clear_template)s<br />%(input_text)s: %(input)s %(ajax_uploader)s'
@@ -166,6 +166,11 @@ class AjaxFileUploader(FileInput):
 
     template_with_clear = '%(clear)s <label for="%(clear_checkbox_id)s">%(clear_checkbox_label)s</label>'
    
+   
+    def __init__(self, attrs=None):
+        super().__init__(attrs)
+
+
     def clear_checkbox_name(self, name):
         """
         Given the name of the file input, return the name of the clear checkbox
@@ -195,14 +200,14 @@ def get_template_substitution_values(self, value):
         #}
 
 
-    def render(self, name, value, attrs=None):
-
-        substitutions = {
+    def render(self, name, value, attrs=None, *args, **kwargs):
+        substitutions = self.get_context(name, value, attrs)
+        substitutions.update({
             'initial_text': self.initial_text,
             'input_text': self.input_text,
             'clear_template': '',
             'clear_checkbox_label': self.clear_checkbox_label,
-        }
+        })
 
         #if 'multiple' in attrs:
         #final_attrs = self.build_attrs(attrs, type=self.input_type, name=name,)
diff --git a/ledgergw/settings.py b/ledgergw/settings.py
index bb90658c8..245fd6ff8 100755
--- a/ledgergw/settings.py
+++ b/ledgergw/settings.py
@@ -1,6 +1,8 @@
 from ledger.settings_base import *
 from django.contrib import messages
 from decimal import Decimal
+import decouple
+import json
 import os
 
 ROOT_URLCONF = 'ledgergw.urls'
diff --git a/ledgergw/templates/ledgergw/web/base_b5.html b/ledgergw/templates/ledgergw/web/base_b5.html
index 8b0ccc2f1..f4d3c87df 100644
--- a/ledgergw/templates/ledgergw/web/base_b5.html
+++ b/ledgergw/templates/ledgergw/web/base_b5.html
@@ -177,8 +177,12 @@ <h1 id="site-title" class="site-logo">
 {% endblock %}
 
 
-<div class="container">
+
+
+ 
   {% block messages %}
+  <div class="container">
+
   <BR>
   {% for message in messages %}
   <div class="alert {{ message.tags }} alert-dismissible shadow fade show" role="alert">      
@@ -186,6 +190,7 @@ <h1 id="site-title" class="site-logo">
       <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
   </div>
   {% endfor %}
+  </div>
   {% endblock %}
 
 
@@ -193,6 +198,6 @@ <h1 id="site-title" class="site-logo">
     {% endblock %}
 
 
-</div>
+
 </body>
 </html>
diff --git a/requirements.txt b/requirements.txt
index 5ffcfa95d..df46fcfc8 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -49,7 +49,7 @@ django-treebeard==4.7.1
 psycopg2-binary>=2.9.4
 whitenoise==5.3.0
 git+https://github.com/dbca-wa/appmonitor_client.git#egg=appmonitor_client
-python-decouple==3.7
+python-decouple>=3.8
 numpy==2.2.5
 requests==2.31.0
 wheel==0.37.1