diff --git a/.gitignore b/.gitignore
index f153405..53ebebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ media
 media-images
 cache
 .idea
-CACHE/
+static/CACHE
 .sass-cache/
 main.css
 main.css.map
@@ -16,6 +16,10 @@ ref.css.map
 .coverage
 crm/dev_settings\.py
 env
+.env
 docs/build
 celerybeat-schedule
 local_settings.py
+media
+.sass-cache
+server.log
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01ee88f..0ade08d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,44 +1,15 @@
-Python 3.5.2:
-    script:
-    - export PY_EXE=python3.5.2
-    - virtualenv -p python3 env
-    - source env/bin/activate
-    - pip install --no-cache-dir -r requirements.txt
-    - python manage.py test --keepdb --parallel --noinput
-    - coverage run --source=accounts,cases,common,contacts,leads,opportunity,tasks,invoices,events,teams,marketing manage.py test --keepdb --noinput
-    - coverage report -m
-    except:
-    - tags
-
-deploy_mp:
-  stage: deploy
-  environment:
-    name: live
-  script:
-    - sudo /bin/rm -rf /home/dj_crm/dj_crm/; cp -r . /home/dj_crm/dj_crm
-    - source /home/dj_crm/env/bin/activate
-    - pip install -r /home/dj_crm/dj_crm/requirements.txt
-    - python /home/dj_crm/dj_crm/manage.py migrate --noinput
-    - sudo /etc/init.d/uwsgi restart
-    - sudo /usr/bin/supervisorctl restart all
-  only:
-    - master
-  tags:
-    - djcrm_micropyramid
-
 deploy_live:
   stage: deploy
   environment:
     name: live
   script:
-    - sudo /bin/rm -rf /home/dj_crm/dj_crm/; cp -r . /home/dj_crm/dj_crm
-    - source /home/dj_crm/env/bin/activate
-    - pip install -r /home/dj_crm/dj_crm/requirements.txt
-    - python /home/dj_crm/dj_crm/manage.py migrate --noinput
-    - python /home/dj_crm/dj_crm/manage.py rebuild_index --noinput
-    - sudo /etc/init.d/uwsgi restart
+    - df -h
+    - sudo /bin/rm -rf /home/bottlecrm/bottlecrm/; cp -r . /home/bottlecrm/bottlecrm/
+    - source /home/bottlecrm/env/bin/activate
+    - pip install -r /home/bottlecrm/bottlecrm/requirements.txt
+    - python /home/bottlecrm/bottlecrm/manage.py migrate --noinput
     - sudo /usr/bin/supervisorctl restart all
   only:
     - master
   tags:
-    - github-crm
+    - bottlecrm-com
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..46f616b
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,6 @@
+repos:
+  - repo: https://github.com/ambv/black
+    rev: stable
+    hooks:
+      - id: black
+        language_version: python3.6
diff --git a/.travis.yml b/.travis.yml
index a1b5b2c..323fbb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.5.2"
+  - "3.6.9"
 
 services:
   - redis-server
@@ -13,7 +13,7 @@ addons:
 sudo: required
 
 env:
-  -DJANGO=1.11
+  -DJANGO=3.0.6
 
 before_install:
   - gem install sass
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..83b1de3
--- /dev/null
+++ b/README.md
@@ -0,0 +1,80 @@
+Django-CRM
+==========
+
+Django CRM is opensource CRM developed on django framework. It has all
+the basic features of CRM to start with. We welcome code contributions
+and feature requests via github.
+
+<http://django-crm.readthedocs.io> for latest documentation
+
+This project contains the following modules.
+
+> -   Contacts
+> -   Accounts
+> -   Invoices
+> -   Cases
+> -   Leads
+> -   Opportunity
+> -   Planner
+
+## Try for free [here](https://bottlecrm.com/)
+---
+
+# Installation
+We recommend ubuntu 18.04 or ubuntu 20.04. These instructions are verified for ubuntu 20.04
+
+#### System Requirements
+---
+
+```
+sudo apt install postgresql xvfb libfontconfig wkhtmltopdf git libpq-dev python3-dev python3-pip gem ruby ruby-dev build-essential libssl-dev libffi-dev python3-venv redis-server redis-tools -y
+
+sudo gem install sass
+
+```
+
+#### Install dependencies
+---
+
+```
+pip install -r requirements.txt
+```
+
+#### env variables
+* Then refer to env.md for environment variables and keep those in the .env file in the current folder as your project is in. Refer https://github.com/theskumar/python-dotenv
+* add ```127.0.0.1   test.localhost``` to your hosts file ```/etc/hosts``` Then you can use test as company name to register and login
+#### next steps
+```
+python manage.py migrate
+python manage.py runserver
+```
+Then open http://localhost:8000 in your borwser and create a new account with test as company name. We mapped test.localhost to 127.0.0.1 So, it should work properly.
+
+Community
+=========
+
+Get help or stay up to date.
+
+-   [Issues](<https://github.com/MicroPyramid/Django-CRM/issues>)
+-   Follow [@micropyramid](<https://twitter.com/micropyramid>) on Twitter
+-   Ask questions on [Stack Overflow](<https://stackoverflow.com/questions/tagged/django-crm>)
+-   Chat with community [Gitter](<https://gitter.im/MicroPyramid/Django-CRM>)
+-   For customisations, email to <django-crm@micropyramid.com>
+
+Credits
+-------
+
+### Contributors
+
+This project exists thanks to all the people who contribute!
+
+![image](https://opencollective.com/django-crm/contributors.svg?width=890&button=false)
+
+
+Feature requests and bug reports
+================================
+
+We welcome your feedback and support, raise github issue if you want to
+report a bug or request new feature. we are glad to help.
+
+For commercial support [Contact us](https://micropyramid.com/contact-us/)
\ No newline at end of file
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 37f6910..0000000
--- a/README.rst
+++ /dev/null
@@ -1,169 +0,0 @@
-Django-CRM
-==========
-
-Django CRM is opensource CRM developed on django framework. It has all the basic features of CRM to start with. We welcome code contributions and feature requests via github.
-
-.. list-table::
-   :header-rows: 1
-   :widths: 50 50 150 90
-   :stub-columns: 1
-
-   *  -  Build Status
-      -  Codacy
-      -  Docker
-      -  Support
-   *  -   .. image:: https://travis-ci.org/MicroPyramid/Django-CRM.svg?branch=master
-             :target: https://travis-ci.org/MicroPyramid/Django-CRM
-             :alt: Travis
-
-          .. image:: https://landscape.io/github/MicroPyramid/Django-CRM/master/landscape.svg?style=flat
-             :target: https://landscape.io/github/MicroPyramid/Django-CRM/master
-             :alt: Code Health
-
-      -  .. image:: https://api.codacy.com/project/badge/Grade/b11da5f09dd542479fd3bd53944595d2
-            :target: https://app.codacy.com/project/ashwin/Django-CRM/dashboard
-            :alt: Codacy Dashboard
-         .. image:: https://coveralls.io/repos/github/MicroPyramid/Django-CRM/badge.svg?branch=master
-            :target: https://coveralls.io/github/MicroPyramid/Django-CRM?branch=master
-            :alt: Codacy Coverage
-
-      -  .. image:: https://img.shields.io/docker/automated/micropyramid/django-crm.svg
-            :target: https://github.com/MicroPyramid/Django-CRM
-            :alt: Docker Automated
-         .. image:: https://img.shields.io/docker/build/micropyramid/django-crm.svg
-            :target: https://github.com/MicroPyramid/Django-CRM
-            :alt: Docker Build Passing
-         .. image:: https://img.shields.io/docker/stars/micropyramid/django-crm.svg
-            :target: https://hub.docker.com/r/micropyramid/django-crm/
-            :alt: Docker Stars
-         .. image:: https://img.shields.io/docker/pulls/micropyramid/django-crm.svg
-            :target: https://hub.docker.com/r/micropyramid/django-crm/
-            :alt: Docker Pulls
-
-      -  .. image:: https://badges.gitter.im/Micropyramid/Django-CRM.png
-            :target: https://gitter.im/MicroPyramid/Django-CRM
-            :alt: Gitter
-         .. image:: https://www.codetriage.com/micropyramid/django-crm/badges/users.svg
-            :target: https://www.codetriage.com/micropyramid/django-crm
-            :alt: Code Helpers
-         .. image:: https://img.shields.io/github/license/MicroPyramid/Django-CRM.svg
-            :target: https://pypi.python.org/pypi/Django-CRM/
-         .. image:: https://opencollective.com/django-crm/backers/badge.svg
-            :alt: Backers on Open Collective
-            :target: #backers
-         .. image:: https://opencollective.com/django-crm/sponsors/badge.svg
-            :alt: Sponsors on Open Collective
-            :target: #sponsors
-
-
-http://django-crm.readthedocs.io for latest documentation
-
-
-This project contains the following modules.
-
-   * Contacts
-   * Accounts
-   * Cases
-   * Leads
-   * Opportunity
-   * Planner
-
-
-Try
-===
-
-Demo Available `here`_.
-
-Demo credentials for Django CRM:
-
-  * **Email:** admin@micropyramid.com
-  * **Password:** admin
-
-
-Installation
-============
-
-* Install the dependencies
-
-   .. code-block:: python
-
-      pip install -r requirements.txt
-      cp crm/local_settings.example crm/local_settings.py
-      python manage.py makemigrations
-      python manage.py createsuperuser
-      python manage.py runserver
-
-  This will install all the required dependencies for django-crm.
-
-  Then update the local_settings.py file with your email host server credentials.
-
-   .. code-block:: python
-
-      EMAIL_HOST = <your email host>
-      EMAIL_HOST_USER = <your username>
-      EMAIL_HOST_PASSWORD = <your password>
-
-  These settings allow django-crm to send emails.
-  After this download and install the System Requirements.
-
-
-System Requirements
-===================
-
-- wkhtmltopdf (https://wkhtmltopdf.org/downloads.html)
-- sass (https://www.npmjs.com/package/sass) or (https://rubygems.org/gems/sass)
-
-Community
-=========
-
-Get help or stay up to date.
-
-- [Contribute on Issues](https://github.com/MicroPyramid/Django-CRM/issues)
-- Follow [@micropyramid](https://twitter.com/micropyramid) on Twitter
-- Ask questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/django-crm)
-- Chat with community [Gitter](https://gitter.im/MicroPyramid/Django-CRM)
-- For customisations, email django-crm@micropyramid.com
-
-Credits
-+++++++
-
-Contributors
-------------
-
-This project exists thanks to all the people who contribute!
-
-.. image:: https://opencollective.com/django-crm/contributors.svg?width=890&button=false
-
-Backers
--------
-
-Thank you to all our backers! `Become a backer`__.
-
-.. image:: https://opencollective.com/django-crm/backers.svg?width=890
-    :target: https://opencollective.com/django-crm#backers
-
-__ Backer_
-.. _Backer: https://opencollective.com/django-crm#backer
-
-Sponsors
---------
-
-Support us by becoming a sponsor. Your logo will show up here with a link to your website. `Become a sponsor`__.
-
-.. image:: https://opencollective.com/django-crm/sponsor/0/avatar.svg
-    :target: https://opencollective.com/django-crm/sponsor/0/website
-
-__ Sponsor_
-.. _Sponsor: https://opencollective.com/django-crm#sponsor
-
-
-
-Feature requests and bug reports
-================================
-We welcome your feedback and support, raise github issue if you want to report a bug or request new feature. we are glad to help.
-
-Need additional commercial support? `Contact us here`_
-
-.. _contact us here: https://micropyramid.com/contact-us/
-
-.. _here: https://django-crm.micropyramid.com/
diff --git a/accounts/models.py b/accounts/models.py
index 5085359..2550056 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -91,8 +91,8 @@ def get_complete_address(self):
             self.get_billing_country_display(),
         ]
         address = utils.append_str_to(address, *add_to_address)
-        return address
 
+        return address
 
     @property
     def created_on_arrow(self):
diff --git a/accounts/templates/accounts.html b/accounts/templates/accounts.html
index e8a9ec6..6634745 100644
--- a/accounts/templates/accounts.html
+++ b/accounts/templates/accounts.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/accounts/templates/create_account.html b/accounts/templates/create_account.html
index f1e3f20..bcd3993 100644
--- a/accounts/templates/create_account.html
+++ b/accounts/templates/create_account.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 {% block extralinks %}
 
diff --git a/accounts/templates/create_mail_accounts.html b/accounts/templates/create_mail_accounts.html
index 3f843b2..022c82e 100644
--- a/accounts/templates/create_mail_accounts.html
+++ b/accounts/templates/create_mail_accounts.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block extralinks %}
 {% load thumbnail %}
diff --git a/accounts/templates/error_template.html b/accounts/templates/error_template.html
index fc91a7e..72690fa 100644
--- a/accounts/templates/error_template.html
+++ b/accounts/templates/error_template.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 
diff --git a/accounts/templates/view_account.html b/accounts/templates/view_account.html
index 4818753..d4a03af 100644
--- a/accounts/templates/view_account.html
+++ b/accounts/templates/view_account.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block breadcrumb %}
 
diff --git a/accounts/views.py b/accounts/views.py
index 5e6516d..4098e38 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -768,4 +768,3 @@ def get_email_data_for_account(request):
         return JsonResponse(ctx)
     else:
         return JsonResponse({"error": True, "data": "No emails found."})
-
diff --git a/cases/templates/cases.html b/cases/templates/cases.html
index f72e07e..87f8821 100644
--- a/cases/templates/cases.html
+++ b/cases/templates/cases.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block extralinks %}
 <style>
diff --git a/cases/templates/create_cases.html b/cases/templates/create_cases.html
index 3380003..601d696 100644
--- a/cases/templates/create_cases.html
+++ b/cases/templates/create_cases.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/cases/templates/show_case.html b/cases/templates/show_case.html
index a629ce6..249aa75 100644
--- a/cases/templates/show_case.html
+++ b/cases/templates/show_case.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 <div class="main_container" id="maincontainer" {% if edit2%}style="display:none"{% endif %}>
 <div class="overview_form_block row marl">
diff --git a/cases/templates/view_case.html b/cases/templates/view_case.html
index 14aba8a..d8cd2e1 100644
--- a/cases/templates/view_case.html
+++ b/cases/templates/view_case.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block content %}
 {% block extralinks %}
diff --git a/common/middleware/get_company.py b/common/middleware/get_company.py
index 1354e0d..8294b3c 100644
--- a/common/middleware/get_company.py
+++ b/common/middleware/get_company.py
@@ -6,43 +6,23 @@
 
 
 class GetCompany(object):
-    """adding company to request object
-    """
-
     def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
-        self.process_request(request)
         response = self.get_response(request)
-
         return response
 
-    def process_request(self, request):
-        company = request.session.get("company", None)
-        if company:
-            company = Company.objects.filter(id=company).first()
-            if company:
-                request.company = company
-
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        company_id = request.session.get('company', None)
+        if company_id:
+            company = Company.objects.get(id=company_id)
+            request.company = company
+            request.session['company'] = company.id
         else:
-            domain = settings.DOMAIN_NAME
-            login_url = request.scheme + "://" + domain + reverse("login")
             host_name = request.META.get("HTTP_HOST")
-
-            if host_name:
-                subdomain = host_name.split(".")[0]
-                if subdomain == "" or subdomain == "api":
-                    request.company = ""
-                else:
-                    company = Company.objects.filter(sub_domain=subdomain).first()
-                    if company:
-                        request.company = company
-                        if request.user.is_authenticated:
-
-                            if request.company != request.user.company:
-                                logout(request)
-                                return redirect(login_url)
-                    else:
-                        logout(request)
-                        return redirect(login_url)
+            subdomain = host_name.split(".")[0]
+            company = Company.objects.filter(sub_domain=subdomain).first()
+            if company:
+                request.company = company
+                request.session['company'] = company.id
diff --git a/common/migrations/0022_auto_20200609_1203.py b/common/migrations/0022_auto_20200609_1203.py
new file mode 100644
index 0000000..81e49fc
--- /dev/null
+++ b/common/migrations/0022_auto_20200609_1203.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.6 on 2020-06-09 06:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0021_document_company'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='company',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='common.Company'),
+        ),
+    ]
diff --git a/common/models.py b/common/models.py
index 28d4851..e85ea94 100644
--- a/common/models.py
+++ b/common/models.py
@@ -51,7 +51,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     )
     has_sales_access = models.BooleanField(default=False)
     has_marketing_access = models.BooleanField(default=False)
-    company = models.ForeignKey(Company, on_delete=models.CASCADE)
+    company = models.ForeignKey(Company, on_delete=models.CASCADE, null=True, blank=True)
 
     USERNAME_FIELD = "email"
     REQUIRED_FIELDS = [
diff --git a/common/tasks.py b/common/tasks.py
index ad2fb31..054ab7d 100644
--- a/common/tasks.py
+++ b/common/tasks.py
@@ -5,7 +5,8 @@
 from django.core.mail import EmailMessage
 from django.shortcuts import reverse
 from django.template.loader import render_to_string
-from django.utils import six, timezone
+from django.utils import timezone
+import six
 from django.utils.encoding import force_bytes, force_text
 from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
 
diff --git a/common/templates/create.html b/common/templates/create.html
index 02d5540..6ec7732 100644
--- a/common/templates/create.html
+++ b/common/templates/create.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/common/templates/doc_create.html b/common/templates/doc_create.html
index 7c0fc76..3bf2327 100644
--- a/common/templates/doc_create.html
+++ b/common/templates/doc_create.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
diff --git a/common/templates/doc_detail.html b/common/templates/doc_detail.html
index 43bf71e..fca9940 100644
--- a/common/templates/doc_detail.html
+++ b/common/templates/doc_detail.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block content%}
 <nav aria-label="breadcrumb">
diff --git a/common/templates/doc_list.html b/common/templates/doc_list.html
index c31987d..97aed8c 100644
--- a/common/templates/doc_list.html
+++ b/common/templates/doc_list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/common/templates/doc_list_1.html b/common/templates/doc_list_1.html
index 315ebda..e7abf1f 100644
--- a/common/templates/doc_list_1.html
+++ b/common/templates/doc_list_1.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/common/templates/list.html b/common/templates/list.html
index fd42550..c856d1c 100644
--- a/common/templates/list.html
+++ b/common/templates/list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 
diff --git a/common/templates/settings/create.html b/common/templates/settings/create.html
index 8bf02af..d8c5c31 100644
--- a/common/templates/settings/create.html
+++ b/common/templates/settings/create.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block extralinks %}
 {% endblock %}
 {% block breadcrumb %}
diff --git a/common/templates/settings/list.html b/common/templates/settings/list.html
index f58c504..394d958 100644
--- a/common/templates/settings/list.html
+++ b/common/templates/settings/list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block content %}
diff --git a/common/templates/settings/update.html b/common/templates/settings/update.html
index 7521ee5..94e5725 100644
--- a/common/templates/settings/update.html
+++ b/common/templates/settings/update.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/common/templates/settings/view.html b/common/templates/settings/view.html
index 053989d..7e63dd4 100644
--- a/common/templates/settings/view.html
+++ b/common/templates/settings/view.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/common/templates/user_detail.html b/common/templates/user_detail.html
index a655367..1694414 100644
--- a/common/templates/user_detail.html
+++ b/common/templates/user_detail.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 {% load thumbnail %}
 <nav aria-label="breadcrumb">
diff --git a/common/templatetags/common_tags.py b/common/templatetags/common_tags.py
index 87c4585..d247634 100644
--- a/common/templatetags/common_tags.py
+++ b/common/templatetags/common_tags.py
@@ -132,6 +132,6 @@ def delete_condition(user, task):
 
 @register.filter
 def view_edit_condition(user, task):
-    if user == task.created_by or user.role == 'ADMIN' or user.has_sales_access or user in task.assigned_to.all:
+    if user == task.created_by or user.role == 'ADMIN' or user.has_sales_access or user in task.assigned_to.all():
         return True
     return False
diff --git a/common/token_generator.py b/common/token_generator.py
index 3c6c7d8..dbdcc20 100644
--- a/common/token_generator.py
+++ b/common/token_generator.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
-from django.utils import six
+# from django.utils import six
+import six
 
 
 class TokenGenerator(PasswordResetTokenGenerator):
diff --git a/common/urls.py b/common/urls.py
index ae89f50..6e2c620 100644
--- a/common/urls.py
+++ b/common/urls.py
@@ -12,7 +12,7 @@
     DocumentListView,
     ForgotPasswordView,
     HomeView,
-    LoginView,
+    # LoginView,
     LogoutView,
     PasswordResetView,
     ProfileView,
@@ -53,7 +53,7 @@
     path("login/", CompanyLoginView.as_view(), name="login"),
     #     path('login/', LoginView.as_view(), name='login'),
     path("register/", RegistrationView.as_view(), name="register"),
-    path("login-sub-domain/", check_sub_domain, name="check_domain"),
+    path("auth/domain/", check_sub_domain, name="check_domain"),
     path("forgot-password/", ForgotPasswordView.as_view(), name="forgot_password"),
     path("logout/", LogoutView.as_view(), name="logout"),
     path("change-password/", ChangePasswordView.as_view(), name="change_password"),
diff --git a/common/utils.py b/common/utils.py
index cdf8511..d9be550 100644
--- a/common/utils.py
+++ b/common/utils.py
@@ -592,18 +592,14 @@ def convert_to_custom_timezone(custom_date, custom_timezone, to_utc=False):
 
 def append_str_to(append_to: str, *args, sep=", ", **kwargs):
     """Concatenate to a string.
-
     Args:
         append_to(str): The string to append to.
         args(list): list of string characters to concatenate.
         sep(str): Seperator to use between concatenated strings.
         kwargs(dict): Mapping of variables with intended string values.
-
     Returns:
         str, joined strings seperated
     """
     append_to = append_to or ""
     result_list = [append_to] + list(args) + list(kwargs.values())
     return f"{sep}".join(filter(len, result_list))
-
-
diff --git a/common/views.py b/common/views.py
index 8c9ac16..572a8b3 100644
--- a/common/views.py
+++ b/common/views.py
@@ -95,7 +95,15 @@ def landing_page(request):
 
 def check_sub_domain(request):
     if request.method == "GET":
+<<<<<<< HEAD
+        try:
+            if request.company:
+                return redirect("common:login")
+        except:
+            return render(request, "check_subdomain.html", {})
+=======
         return render(request, "check_subdomain.html", {})
+>>>>>>> 13b750edba53c119df91e8ca10557731d6d555f7
     if request.method == "POST":
         sub_domain = request.POST.get("sub_domain", "")
         company = Company.objects.filter(sub_domain=sub_domain).first()
@@ -217,6 +225,90 @@ def get_context_data(self, **kwargs):
         return context
 
 
+<<<<<<< HEAD
+# class LoginView(TemplateView):
+#     template_name = "login.html"
+
+#     def get_context_data(self, **kwargs):
+#         context = super(LoginView, self).get_context_data(**kwargs)
+#         context["ENABLE_GOOGLE_LOGIN"] = settings.ENABLE_GOOGLE_LOGIN
+#         context["GP_CLIENT_SECRET"] = settings.GP_CLIENT_SECRET
+#         context["GP_CLIENT_ID"] = settings.GP_CLIENT_ID
+#         return context
+
+#     def dispatch(self, request, *args, **kwargs):
+#         if request.user.is_authenticated:
+#             return redirect("common:dashboard")
+#         return super(LoginView, self).dispatch(request, *args, **kwargs)
+
+#     def post(self, request, *args, **kwargs):
+#         form = LoginForm(request.POST, request=request)
+#         if form.is_valid():
+
+#             user = User.objects.filter(email=request.POST.get("email")).first()
+#             # user = authenticate(username=request.POST.get('email'), password=request.POST.get('password'))
+#             if user is not None:
+#                 if user.is_active:
+#                     user = authenticate(
+#                         username=request.POST.get("email"),
+#                         password=request.POST.get("password"),
+#                     )
+#                     if user is not None:
+#                         login(request, user)
+#                         if user.has_sales_access:
+#                             return redirect("common:dashboard")
+#                         elif user.has_marketing_access:
+#                             return redirect("marketing:dashboard")
+#                         else:
+#                             return redirect("common:dashboard")
+#                     return render(
+#                         request,
+#                         "login.html",
+#                         {
+#                             "ENABLE_GOOGLE_LOGIN": settings.ENABLE_GOOGLE_LOGIN,
+#                             "GP_CLIENT_SECRET": settings.GP_CLIENT_SECRET,
+#                             "GP_CLIENT_ID": settings.GP_CLIENT_ID,
+#                             "error": True,
+#                             "message": "Your username and password didn't match. \
+#                         Please try again.",
+#                         },
+#                     )
+#                 return render(
+#                     request,
+#                     "login.html",
+#                     {
+#                         "ENABLE_GOOGLE_LOGIN": settings.ENABLE_GOOGLE_LOGIN,
+#                         "GP_CLIENT_SECRET": settings.GP_CLIENT_SECRET,
+#                         "GP_CLIENT_ID": settings.GP_CLIENT_ID,
+#                         "error": True,
+#                         "message": "Your Account is inactive. Please Contact Administrator",
+#                     },
+#                 )
+#             return render(
+#                 request,
+#                 "login.html",
+#                 {
+#                     "ENABLE_GOOGLE_LOGIN": settings.ENABLE_GOOGLE_LOGIN,
+#                     "GP_CLIENT_SECRET": settings.GP_CLIENT_SECRET,
+#                     "GP_CLIENT_ID": settings.GP_CLIENT_ID,
+#                     "error": True,
+#                     "message": "Your Account is not Found. Please Contact Administrator",
+#                 },
+#             )
+
+#         return render(
+#             request,
+#             "login.html",
+#             {
+#                 "ENABLE_GOOGLE_LOGIN": settings.ENABLE_GOOGLE_LOGIN,
+#                 "GP_CLIENT_SECRET": settings.GP_CLIENT_SECRET,
+#                 "GP_CLIENT_ID": settings.GP_CLIENT_ID,
+#                 # "error": True,
+#                 # "message": "Your username and password didn't match. Please try again."
+#                 "form": form,
+#             },
+#         )
+=======
 class LoginView(TemplateView):
     template_name = "login.html"
 
@@ -299,6 +391,7 @@ def post(self, request, *args, **kwargs):
                 "form": form,
             },
         )
+>>>>>>> 13b750edba53c119df91e8ca10557731d6d555f7
 
 
 class ForgotPasswordView(TemplateView):
@@ -389,19 +482,32 @@ def post(self, request, *args, **kwargs):
         if form.is_valid():
             email = form.cleaned_data.get("email", "")
             password = form.cleaned_data.get("password", "")
+<<<<<<< HEAD
+            # company = get_object_or_404(Company, pk=form.data.get("company", ""))
+            if request.company:
+                user = User.objects.filter(email=email, company=request.company).first()
+                if user is not None:
+                    if user.is_active:
+                        user = authenticate(email=email, password=password, company=request.company)
+=======
             company = get_object_or_404(Company, pk=form.data.get("company", ""))
             if company:
                 user = User.objects.filter(email=email, company=company).first()
                 if user is not None:
                     if user.is_active:
                         user = authenticate(email=email, password=password,)
+>>>>>>> 13b750edba53c119df91e8ca10557731d6d555f7
                         if user is not None:
                             login(request, user)
                             request.session["company"] = (
                                 user.company.id if user.company else None
                             )
                             if user.has_sales_access:
+<<<<<<< HEAD
+                                return redirect(reverse('common:dashboard'))
+=======
                                 return redirect("common:dashboard")
+>>>>>>> 13b750edba53c119df91e8ca10557731d6d555f7
                             elif user.has_marketing_access:
                                 return redirect("marketing:dashboard")
                             else:
diff --git a/contacts/templates/contacts.html b/contacts/templates/contacts.html
index 5d76b2b..b11d67f 100644
--- a/contacts/templates/contacts.html
+++ b/contacts/templates/contacts.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/contacts/templates/create_contact.html b/contacts/templates/create_contact.html
index d827f5a..8e40c08 100644
--- a/contacts/templates/create_contact.html
+++ b/contacts/templates/create_contact.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/contacts/templates/view_contact.html b/contacts/templates/view_contact.html
index 0f55916..9dd2d97 100644
--- a/contacts/templates/view_contact.html
+++ b/contacts/templates/view_contact.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block breadcrumb %}
 {% block extralinks %}
diff --git a/crm/_local_settings.py b/crm/_local_settings.py
deleted file mode 100644
index e03e199..0000000
--- a/crm/_local_settings.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from crm.settings import *
-
-DOMAIN_NAME = "test.io"
-
-SESSION_COOKIE_DOMAIN = ".test.io"
-
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": "dj_crm",
-        "USER": "postgres",
-        "PASSWORD": "root",
-        "HOST": os.getenv("DB_HOST", "127.0.0.1"),
-        "PORT": os.getenv("DB_PORT", "5433"),
-    }
-}
-
-ALLOWED_HOSTS = ["*"]
diff --git a/crm/server_settings.py b/crm/server_settings.py
index 83223e1..b7ab91e 100644
--- a/crm/server_settings.py
+++ b/crm/server_settings.py
@@ -1,44 +1,36 @@
 import os
 
-MIDDLEWARE = [
-    "django.middleware.security.SecurityMiddleware",
-    "whitenoise.middleware.WhiteNoiseMiddleware",
-    "django.middleware.common.CommonMiddleware",
-    "django.contrib.sessions.middleware.SessionMiddleware",
-    "django.contrib.auth.middleware.AuthenticationMiddleware",
-    "django.contrib.messages.middleware.MessageMiddleware",
-    "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "common.middleware.get_company.GetCompany",
-]
-
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": "dj_crm",
-        "USER": "admin",
-        "PASSWORD": "U988fQkB5sW7eprr",
-        "HOST": "88.99.114.133",
-        "PORT": "5432",
-    }
-}
 
-# celery Tasks
-CELERY_BROKER_URL = "redis://88.99.114.133:6379"
-CELERY_RESULT_BACKEND = "redis://88.99.114.133:6379"
-
-# Load the local settings file if it exists
-if os.path.isfile("crm/local_settings.py"):
-    from .local_settings import *
-elif os.path.isfile("crm/server_settings.py"):
-    from .server_settings import *
-
-CACHES = {
-    "default": {
-        "BACKEND": "django.core.cache.backends.memcached.MemcachedCache",
-        "LOCATION": "88.99.114.133:11211",
-    }
+DOMAIN_NAME = "bottlecrm.com"
+
+AWS_STORAGE_BUCKET_NAME = AWS_BUCKET_NAME = os.getenv("AWSBUCKETNAME", "")
+AM_ACCESS_KEY = AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID", "")
+AM_PASS_KEY = AWS_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY", "")
+S3_DOMAIN = AWS_S3_CUSTOM_DOMAIN = str(AWS_BUCKET_NAME) + ".s3.amazonaws.com"
+
+AWS_S3_OBJECT_PARAMETERS = {
+    "CacheControl": "max-age=86400",
 }
+
+STATICFILES_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+
+DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+DEFAULT_S3_PATH = "media"
+STATICFILES_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+STATIC_S3_PATH = "static"
+COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+
+COMPRESS_JS_FILTERS = ["compressor.filters.jsmin.JSMinFilter"]
+
+MEDIA_ROOT = "/%s/" % DEFAULT_S3_PATH
+MEDIA_URL = "//%s/%s/" % (S3_DOMAIN, DEFAULT_S3_PATH)
+STATIC_ROOT = "/%s/" % STATIC_S3_PATH
+STATIC_URL = "https://%s/" % (S3_DOMAIN)
+ADMIN_MEDIA_PREFIX = STATIC_URL + "admin/"
+
+CORS_ORIGIN_ALLOW_ALL = True
+
+AWS_IS_GZIPPED = True
+AWS_ENABLED = True
+AWS_S3_SECURE_URLS = True
+COMPRESS_URL = STATIC_URL
diff --git a/crm/settings.py b/crm/settings.py
index 639b582..ce37e93 100644
--- a/crm/settings.py
+++ b/crm/settings.py
@@ -1,25 +1,28 @@
 import os
-
+from dotenv import load_dotenv
+from pathlib import Path
 from celery.schedules import crontab
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+env_path = Path('.') / '.env'
+load_dotenv(dotenv_path=env_path)
+
 # SECURITY WARNING: keep the secret key used in production secret!
-# Set in local_settings.py
-SECRET_KEY = "SECRET_SECRET_SECRET"
+SECRET_KEY = os.getenv('SECRETKEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = os.getenv('DEBUG_STATUS', False)
+DEBUG = True
 
-ALLOWED_HOSTS = ["*"]
+ALLOWED_HOSTS = [".bottlecrm.com", ".localhost"]
 
 # Application definition
 
 LOGIN_REDIRECT_URL = "/"
 
 # LOGIN_URL = "/login/"
-LOGIN_URL = "/login-sub-domain/"
+LOGIN_URL = "/auth/domain/"
 
 INSTALLED_APPS = [
     "django.contrib.auth",
@@ -72,7 +75,7 @@
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
                 "common.context_processors.common.app_name",
-                'django_settings_export.settings_export',
+                "django_settings_export.settings_export",
             ],
         },
     },
@@ -86,16 +89,18 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "NAME": "dj_crm",
-        "USER": "postgres",
-        "PASSWORD": "root",
-        "HOST": os.getenv("DB_HOST", "127.0.0.1"),
-        "PORT": os.getenv("DB_PORT", "5432"),
+        "NAME": os.getenv("DBNAME"),
+        "USER": os.getenv("DBUSER"),
+        "PASSWORD": os.getenv("DBPASSWORD"),
+        "HOST": os.getenv("DBHOST"),
+        "PORT": os.getenv("DBPORT"),
     }
 }
 
+
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, "static"),
+    os.path.join(BASE_DIR, "blog_app/static"),
 ]
 
 # Password validation
@@ -145,9 +150,16 @@
 
 AUTH_USER_MODEL = "common.User"
 
-STORAGE_TYPE = os.getenv("STORAGE_TYPE", "normal")
+ENV_TYPE = os.getenv("ENV_TYPE", "dev")
+
+if ENV_TYPE == "dev":
+    DOMAIN_NAME = "localhost:8000"
+    # SESSION_COOKIE_DOMAIN = "localhost:8000"
+
+    # DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+    # STATICFILES_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+    # COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 
-if STORAGE_TYPE == "normal":
     MEDIA_ROOT = os.path.join(BASE_DIR, "media")
     MEDIA_URL = "/media/"
 
@@ -155,45 +167,18 @@
     STATICFILES_DIRS = (BASE_DIR + "/static",)
     COMPRESS_ROOT = BASE_DIR + "/static/"
 
-elif STORAGE_TYPE == "s3-storage":
+    ADMIN_MEDIA_PREFIX = STATIC_URL + "admin/"
 
-    AWS_STORAGE_BUCKET_NAME = AWS_BUCKET_NAME = os.getenv("AWSBUCKETNAME", "")
-    AM_ACCESS_KEY = AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID", "")
-    AM_PASS_KEY = AWS_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY", "")
-    S3_DOMAIN = AWS_S3_CUSTOM_DOMAIN = str(AWS_BUCKET_NAME) + ".s3.amazonaws.com"
 
-    AWS_S3_OBJECT_PARAMETERS = {
-        "CacheControl": "max-age=86400",
-    }
+elif ENV_TYPE == "live":
+    from .server_settings import *
+    SESSION_COOKIE_DOMAIN = ".bottlecrm.com"
 
-    STATICFILES_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-
-    DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-    DEFAULT_S3_PATH = "media"
-    STATICFILES_STORAGE = "storages.backends.s3boto.S3BotoStorage"
-    STATIC_S3_PATH = "static"
-    COMPRESS_STORAGE = "storages.backends.s3boto.S3BotoStorage"
-
-    COMPRESS_CSS_FILTERS = [
-        "compressor.filters.css_default.CssAbsoluteFilter",
-        "compressor.filters.cssmin.CSSMinFilter",
-    ]
-    COMPRESS_JS_FILTERS = ["compressor.filters.jsmin.JSMinFilter"]
-    COMPRESS_REBUILD_TIMEOUT = 5400
-
-    MEDIA_ROOT = "/%s/" % DEFAULT_S3_PATH
-    MEDIA_URL = "//%s/%s/" % (S3_DOMAIN, DEFAULT_S3_PATH)
-    STATIC_ROOT = "/%s/" % STATIC_S3_PATH
-    STATIC_URL = "https://%s/" % (S3_DOMAIN)
-    ADMIN_MEDIA_PREFIX = STATIC_URL + "admin/"
 
-    CORS_ORIGIN_ALLOW_ALL = True
+# CORS_ORIGIN_ALLOW_ALL = True
 
-    AWS_IS_GZIPPED = True
-    AWS_ENABLED = True
-    AWS_S3_SECURE_URLS = True
-
-COMPRESS_ROOT = BASE_DIR + "/static/"
+# COMPRESS_ROOT = BASE_DIR + "/static/"
+COMPRESS_JS_FILTERS = ["compressor.filters.jsmin.JSMinFilter"]
 
 COMPRESS_ENABLED = True
 
@@ -211,8 +196,10 @@
     "compressor.filters.css_default.CssAbsoluteFilter",
     "compressor.filters.cssmin.CSSMinFilter",
 ]
+
 COMPRESS_REBUILD_TIMEOUT = 5400
 
+
 COMPRESS_OUTPUT_DIR = "CACHE"
 COMPRESS_URL = STATIC_URL
 
@@ -226,11 +213,11 @@
     "STATIC_URL": "STATIC_URL",
 }
 
-DEFAULT_FROM_EMAIL = "no-reply@django-crm.micropyramid.com"
+DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL")
 
 # celery Tasks
-CELERY_BROKER_URL = "redis://localhost:6379"
-CELERY_RESULT_BACKEND = "redis://localhost:6379"
+CELERY_BROKER_URL = os.getenv("CELERY_BROKER_URL")
+CELERY_RESULT_BACKEND = os.getenv("CELERY_RESULT_BACKEND")
 
 CELERY_BEAT_SCHEDULE = {
     "runs-campaign-for-every-thiry-minutes": {
@@ -252,35 +239,30 @@
 }
 
 MAIL_SENDER = "AMAZON"
-INACTIVE_MAIL_SENDER = "MANDRILL"
+# INACTIVE_MAIL_SENDER = "MANDRILL"
 
 AM_ACCESS_KEY = os.getenv("AM_ACCESS_KEY", "")
 AM_PASS_KEY = os.getenv("AM_PASS_KEY", "")
 AWS_REGION = os.getenv("AWS_REGION", "")
 
-MGUN_API_URL = os.getenv("MGUN_API_URL", "")
-MGUN_API_KEY = os.getenv("MGUN_API_KEY", "")
-
-SG_USER = os.getenv("SG_USER", "")
-SG_PWD = os.getenv("SG_PWD", "")
+# MGUN_API_URL = os.getenv("MGUN_API_URL", "")
+# MGUN_API_KEY = os.getenv("MGUN_API_KEY", "")
 
-MANDRILL_API_KEY = os.getenv("MANDRILL_API_KEY", "")
+# SG_USER = os.getenv("SG_USER", "")
+# SG_PWD = os.getenv("SG_PWD", "")
 
-ADMIN_EMAIL = "admin@micropyramid.com"
+# MANDRILL_API_KEY = os.getenv("MANDRILL_API_KEY", "")
 
-URL_FOR_LINKS = "http://demo.django-crm.io"
 
-try:
-    from .dev_settings import *
-except ImportError:
-    pass
+# Marketing app related
+# URL_FOR_LINKS = os.getenv("URLFORLINKS")
 
 
-GP_CLIENT_ID = os.getenv("GP_CLIENT_ID", False)
-GP_CLIENT_SECRET = os.getenv("GP_CLIENT_SECRET", False)
-ENABLE_GOOGLE_LOGIN = os.getenv("ENABLE_GOOGLE_LOGIN", False)
+# GP_CLIENT_ID = os.getenv("GP_CLIENT_ID", False)
+# GP_CLIENT_SECRET = os.getenv("GP_CLIENT_SECRET", False)
+# ENABLE_GOOGLE_LOGIN = os.getenv("ENABLE_GOOGLE_LOGIN", False)
 
-MARKETING_REPLY_EMAIL = "djangocrm@micropyramid.com"
+MARKETING_REPLY_EMAIL = os.getenv("MARKETINGREPLYEMAIL")
 
 PASSWORD_RESET_TIMEOUT_DAYS = 3
 
@@ -298,45 +280,56 @@
             "raven.contrib.django.raven_compat.middleware.Sentry404CatchMiddleware",
             "raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware",
         ] + MIDDLEWARE
-        LOGGING = {
-            "version": 1,
-            "disable_existing_loggers": True,
-            "root": {"level": "WARNING", "handlers": ["sentry"],},
-            "formatters": {
-                "verbose": {
-                    "format": "%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s"
-                },
-            },
-            "handlers": {
-                "sentry": {
-                    "level": "ERROR",
-                    "class": "raven.contrib.django.raven_compat.handlers.SentryHandler",
-                },
-                "console": {
-                    "level": "DEBUG",
-                    "class": "logging.StreamHandler",
-                    "formatter": "verbose",
-                },
-            },
-            "loggers": {
-                "django.db.backends": {
-                    "level": "ERROR",
-                    "handlers": ["console"],
-                    "propagate": False,
-                },
-                "raven": {
-                    "level": "DEBUG",
-                    "handlers": ["console"],
-                    "propagate": False,
-                },
-                "sentry.errors": {
-                    "level": "DEBUG",
-                    "handlers": ["console"],
-                    "propagate": False,
-                },
-            },
-        }
 
+
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "filters": {
+        "require_debug_false": {"()": "django.utils.log.RequireDebugFalse", },
+        "require_debug_true": {"()": "django.utils.log.RequireDebugTrue", },
+    },
+    "formatters": {
+        "django.server": {
+            "()": "django.utils.log.ServerFormatter",
+            "format": "[%(server_time)s] %(message)s",
+        }
+    },
+    "handlers": {
+        "console": {
+            "level": "INFO",
+            "filters": ["require_debug_true"],
+            "class": "logging.StreamHandler",
+        },
+        "console_debug_false": {
+            "level": "ERROR",
+            "filters": ["require_debug_false"],
+            "class": "logging.StreamHandler",
+        },
+        "django.server": {
+            "level": "INFO",
+            "class": "logging.StreamHandler",
+            "formatter": "django.server",
+        },
+        "mail_admins": {
+            "level": "ERROR",
+            "filters": ["require_debug_false"],
+            "class": "django.utils.log.AdminEmailHandler",
+        },
+        "logfile": {"class": "logging.FileHandler", "filename": "server.log",},
+    },
+    "loggers": {
+        "django": {
+            "handlers": ["console", "console_debug_false", "logfile",],
+            "level": "INFO",
+        },
+        "django.server": {
+            "handlers": ["django.server"],
+            "level": "INFO",
+            "propagate": False,
+        },
+    },
+}
 # HAYSTACK_CONNECTIONS = {
 #     'default': {
 #         # 'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
@@ -386,29 +379,16 @@
 # HAYSTACK_DEFAULT_OPERATOR = 'AND'
 
 APPLICATION_NAME = "bottlecrm"
-DOMAIN_NAME = "bottlecrm.com"
-
-SESSION_COOKIE_DOMAIN = ".bottlecrm.com"
-
-# Load the local settings file if it exists
-if DEBUG:
-    try:
-        from .dev_settings import *
-    except ImportError:
-        raise ImproperlyConfigured("No dev settings file found")
-else:
-    try:
-        from .local_settings import *
-    except ImportError:
-        raise ImproperlyConfigured("No local settings file found")
+
 
 CACHES = {
     "default": {
         "BACKEND": "django.core.cache.backends.memcached.MemcachedCache",
-        "LOCATION": "127.0.0.1:11211",
+        "LOCATION": os.getenv('MEMCACHELOCATION')
     }
 }
 
-PASSWORD_RESET_MAIL_FROM_USER = os.getenv(
-    "PASSWORD_RESET_MAIL_FROM_USER", "no-reply@bottlecrm.com"
-)
+PASSWORD_RESET_MAIL_FROM_USER = os.getenv('PASSWORD_RESET_MAIL_FROM_USER')
+
+
+SETTINGS_EXPORT = ["APPLICATION_NAME"]
diff --git a/crm/test_settings.py b/crm/test_settings.py
deleted file mode 100644
index 6148684..0000000
--- a/crm/test_settings.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from crm.settings import *
-
-DOMAIN_NAME = "test.io"
-
-SESSION_COOKIE_DOMAIN = ".test.io"
-
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": "dj_crm",
-        "USER": "postgres",
-        "PASSWORD": "root",
-        "HOST": os.getenv("DB_HOST", "127.0.0.1"),
-        "PORT": os.getenv("DB_PORT", "5433"),
-    }
-}
-
-ALLOWED_HOSTS = ["*"]
-
-CELERY_BROKER_URL = "redis://127.0.0.1:6379"
-CELERY_RESULT_BACKEND = "redis://127.0.0.1:6379"
diff --git a/crm/urls.py b/crm/urls.py
index 3e2ff68..82b801c 100644
--- a/crm/urls.py
+++ b/crm/urls.py
@@ -4,30 +4,30 @@
 from django.urls import include, path
 from common.views import handler404, handler500
 
-app_name = 'crm'
+app_name = "crm"
 
 urlpatterns = [
-    path('', include('common.urls', namespace="common")),
-    path('', include('django.contrib.auth.urls')),
-    path('marketing/', include('marketing.urls', namespace="marketing")),
-    path('accounts/', include('accounts.urls', namespace="accounts")),
-    path('leads/', include('leads.urls', namespace="leads")),
-    path('contacts/', include('contacts.urls', namespace="contacts")),
-    path('opportunities/',
-         include('opportunity.urls', namespace="opportunities")),
-    path('cases/', include('cases.urls', namespace="cases")),
-    path('tasks/', include('tasks.urls', namespace="tasks")),
-    path('invoices/', include('invoices.urls', namespace="invoices")),
-    path('events/', include('events.urls', namespace="events")),
-    path('teams/', include('teams.urls', namespace="teams")),
-    path('emails/', include('emails.urls', namespace="emails")),
+    path("", include("common.urls", namespace="common")),
+    path("", include("django.contrib.auth.urls")),
+    path("marketing/", include("marketing.urls", namespace="marketing")),
+    path("accounts/", include("accounts.urls", namespace="accounts")),
+    path("leads/", include("leads.urls", namespace="leads")),
+    path("contacts/", include("contacts.urls", namespace="contacts")),
+    path("opportunities/", include("opportunity.urls", namespace="opportunities")),
+    path("cases/", include("cases.urls", namespace="cases")),
+    path("tasks/", include("tasks.urls", namespace="tasks")),
+    path("invoices/", include("invoices.urls", namespace="invoices")),
+    path("events/", include("events.urls", namespace="events")),
+    path("teams/", include("teams.urls", namespace="teams")),
+    path("emails/", include("emails.urls", namespace="emails")),
     # path('planner/', include('planner.urls', namespace="planner")),
-    path('logout/', views.LogoutView, {'next_page': '/login/'}, name="logout"),
-
+    path("logout/", views.LogoutView, {"next_page": "/login/"}, name="logout"),
 ]
 
 if settings.DEBUG:
-    urlpatterns = urlpatterns + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns = urlpatterns + static(
+        settings.MEDIA_URL, document_root=settings.MEDIA_ROOT
+    )
 
 
 handler404 = handler404
diff --git a/db.env b/db.env
deleted file mode 100644
index 0d6e0c2..0000000
--- a/db.env
+++ /dev/null
@@ -1,6 +0,0 @@
-# Database environment variables
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=root
-POSTGRES_DB=dj_crm
-DB_HOST=db
-DB_PORT=5432
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ad25587..ced5abc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,6 +7,8 @@ services:
       dockerfile: docker/dockerfile
       args:
         UWSGI_HTTP: 8000
+    env_file:
+      - ./db.env
     volumes:
       - /root/djcrm/media:/root/djcrm/media
       - /root/djcrm/static/CACHE:/root/djcrm/static/CACHE
@@ -18,6 +20,8 @@ services:
       dockerfile: docker/dockerfile
       args:
         UWSGI_HTTP: 8001
+    env_file:
+      - ./db.env
     volumes:
       - /root/djcrm/media:/root/djcrm/media
       - /root/djcrm/static/CACHE:/root/djcrm/static/CACHE
@@ -29,6 +33,8 @@ services:
       dockerfile: docker/dockerfile
       args:
         UWSGI_HTTP: 8002
+    env_file:
+      - ./db.env
     volumes:
       - /root/djcrm/media:/root/djcrm/media
       - /root/djcrm/static/CACHE:/root/djcrm/static/CACHE
@@ -40,6 +46,8 @@ services:
       dockerfile: docker/dockerfile
       args:
         UWSGI_HTTP: 8003
+    env_file:
+      - ./db.env
     volumes:
       - /root/djcrm/media:/root/djcrm/media
       - /root/djcrm/static/CACHE:/root/djcrm/static/CACHE
diff --git a/docker/dockerfile b/docker/dockerfile
index 2f282a9..e6af9d2 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -9,13 +9,14 @@ RUN pip3 install setuptools
 RUN gem install sass
 
 RUN mkdir ${APPDIR}
-WORKDIR ${APPDIR} 
+WORKDIR ${APPDIR}
 ADD . ${APPDIR}
 RUN mkdir ${APPDIR}/media
 RUN mkdir ${APPDIR}/static/CACHE
 
 RUN pip3 install --no-cache-dir -r ${APPDIR}/requirements.txt
 RUN python3 manage.py collectstatic --noinput
+RUN python3 manage.py compress --force
 RUN python3 manage.py migrate
 
 # remove build pkgs
@@ -31,4 +32,4 @@ ENV UWSGI_HTTP=:${UWSGI_HTTP} UWSGI_MASTER=1 UWSGI_HTTP_AUTO_CHUNKED=1 UWSGI_HTT
 # ENV DJANGO_ENVIRONMENT=live
 
 EXPOSE ${UWSGI_HTTP}
-CMD ["uwsgi", "--show-config"]
+CMD ["uwsgi", "--show-config"]
\ No newline at end of file
diff --git a/docs/source/Accounts.rst b/docs/source/Accounts.rst
index e548b8e..5e644f4 100644
--- a/docs/source/Accounts.rst
+++ b/docs/source/Accounts.rst
@@ -6,7 +6,7 @@ Accounts
 |  Create your Accounts  - new account can be created for different users and contacts and leads can create in accounts itself in their view pages
 
 
-.. image:: screenshots/accountshome1.png
+
 
 |  **Fig** Accounts page
 
@@ -20,7 +20,6 @@ Accounts
 
 |  **Optional:** We can filter the users based on name,city,tags .
 
-.. image:: screenshots/accountcreate.png
 
 |  **Fig** Account create page
 
diff --git a/docs/source/Cases.rst b/docs/source/Cases.rst
index a00ce20..12777f1 100644
--- a/docs/source/Cases.rst
+++ b/docs/source/Cases.rst
@@ -2,7 +2,6 @@ Cases
 *****
 
 
-.. image:: screenshots/caseshome1.png
 
 |  **Fig** cases Home Page
 
@@ -11,7 +10,6 @@ Cases
 
 |  Create a new Lead using the button on right corner ``+ Add New case``
 
-.. image:: screenshots/casescreate.png
 
 |  **Fig** cases Create Page
 
diff --git a/docs/source/Change Password.rst b/docs/source/Change Password.rst
index 93f23f7..77ba43c 100644
--- a/docs/source/Change Password.rst	
+++ b/docs/source/Change Password.rst	
@@ -2,7 +2,6 @@ Change Password
 ***************
 
 
-.. image:: screenshots/changepassword.png
 
 |  **Fig** Password Change Page
 
diff --git a/docs/source/Contacts.rst b/docs/source/Contacts.rst
index a0f08c2..0287132 100644
--- a/docs/source/Contacts.rst
+++ b/docs/source/Contacts.rst
@@ -5,7 +5,6 @@ Contacts
 
 
 
-.. image:: screenshots/contactshome1.png
 
 |  **Fig** Contacts Home Page
 
@@ -14,7 +13,6 @@ Contacts
 
 |  Create a new Lead using the button on right corner ``+ Add New contact``
 
-.. image:: screenshots/contactscreate.png
 
 |  **Fig** Contacts Create Page
 
diff --git a/docs/source/Documents.rst b/docs/source/Documents.rst
index 4b7cad9..c6c9a52 100644
--- a/docs/source/Documents.rst
+++ b/docs/source/Documents.rst
@@ -2,7 +2,6 @@ Documents
 *********
 
 
-.. image:: screenshots/documentshome1.png
 
 |  **Fig** documents Home Page
 
@@ -11,7 +10,6 @@ Documents
 
 |  Create a new Document using the button on right corner ``+ Add New Document``
 
-.. image:: screenshots/documentscreate.png
 
 |  **Fig** Documents Create Page
 
diff --git a/docs/source/Forget Password.rst b/docs/source/Forget Password.rst
index c15aa7a..e7ab74b 100644
--- a/docs/source/Forget Password.rst	
+++ b/docs/source/Forget Password.rst	
@@ -1,32 +1,27 @@
 Forget Password
 ***************
 
-.. image:: screenshots/forgetpasswordpage.png
 
 |  **Fig** Forget Password Page View
 
 |  Enter the registered email id and click submit, then you will be sent a email to the registered email address, and redirect to the acknowledge page as below figure
 
-.. image:: screenshots/mailsent.png
 
 |  **Fig** Email Sent acknowledgement view
 
 |  When you check the mail you will recieve a email similar to the below figure.
 
-.. image:: screenshots/email.png
 
 |  **Fig** Email recieved
 
 |  When you click on the link in the mail, you will get a page as below
 
-.. image:: screenshots/resetpassword.png
 
 |  **Fig** Password Reset view
 
 
 |  After you successful change the password you will get below page
 
-.. image:: screenshots/resetsuccessful.png
 
 |  **Fig** Password Reset Successful view
 
@@ -34,7 +29,6 @@ Forget Password
 
 |  After successful login you will be redirected to Dashboard which looks similiar to the below figure
 
-.. image:: screenshots/homepage.png
 
 |  **Fig** Dashboard view
 
diff --git a/docs/source/Leads.rst b/docs/source/Leads.rst
index 86bd596..11098fa 100644
--- a/docs/source/Leads.rst
+++ b/docs/source/Leads.rst
@@ -2,16 +2,14 @@ Leads
 *****
 
 
-.. image:: screenshots/leadshome1.png
 
 |  **Fig** Accounts Home Page
 
-|  The above figure shows the leads view, this page gives details and list view of leads
+|  This is Account Home Page, this page gives details and list view of leads
 |  You can filter the results by name, source, assigned user, status, tags
 
 |  Create a new Lead using the button on right corner ``+ Add New Lead``
 
-.. image:: screenshots/leadscreate.png
 
 |  **Fig** Leads Create Page
 
diff --git a/docs/source/Login.rst b/docs/source/Login.rst
index d91ff90..798dbc2 100644
--- a/docs/source/Login.rst
+++ b/docs/source/Login.rst
@@ -1,6 +1,5 @@
 Login
 *****
 
-.. image:: screenshots/login.png
 
 |  **Fig** Login Page
diff --git a/docs/source/Opportunity.rst b/docs/source/Opportunity.rst
index 39a076d..80ea57d 100644
--- a/docs/source/Opportunity.rst
+++ b/docs/source/Opportunity.rst
@@ -4,7 +4,6 @@ Opportunity
 |  New Opportunities can be added and can be assigned to accounts and contacts.
 
 
-.. image:: screenshots/opportunityhome1.png
 
 |  **Fig** Opportunity Home Page
 
@@ -14,7 +13,6 @@ Opportunity
 
 |  Create a new Lead using the button on right corner ``+ Add New Opportunity``
 
-.. image:: screenshots/opportunitycreate.png
 
 |  **Fig** Opportunity Create Page
 
diff --git a/docs/source/Profile.rst b/docs/source/Profile.rst
index c008c89..7328d17 100644
--- a/docs/source/Profile.rst
+++ b/docs/source/Profile.rst
@@ -3,8 +3,7 @@ Profile
 
 Dropdown menu for user settings
 
-.. image:: screenshots/dropdown.png
-	:align: center
+
 
 |  **Fig** Dropdown menu
 
@@ -15,8 +14,6 @@ Users
 
 |  On clicking users, the following page is shown
 
-.. image:: screenshots/usershome.png
-	:align: center
 
 |  **Fig:** Users view
 
@@ -26,15 +23,12 @@ Users
 
 |  One clicking `` + Add New User`` the following page is shown:
 
-.. image:: screenshots/createuser.png
-	:align: center
 
 |  **Fig** User create page
 
 |  **Note:** Fields having ``*`` are mandatory.
 
-.. image:: screenshots/edituser.png
-	:align: center
+
 
 |  **Fig:** User Edit User page
 
@@ -49,8 +43,7 @@ Settings
 
 |  Click on `` + Add New Setting``
 
-.. image:: screenshots/createsettings.png
-	:align: center
+
 
 |  **Fig:** User Create Setting page
 
@@ -60,8 +53,7 @@ Change Password
 
 |  On clicking settings, the following page is shown:
 
-.. image:: screenshots/changepassword.png
-	:align: center
+
 
 |  **Fig:** User Change password page
 
@@ -70,13 +62,11 @@ Profile
 
 |  On clicking settings, the following page is shown:
 
-.. image:: screenshots/profilehome.png
-	:align: center
+
 
 |  **Fig:** User profile page
 
-.. image:: screenshots/editprofile.png
-	:align: center
+
 
 |  **Fig:** User edit profile page
 
diff --git a/docs/source/screenshots/accountcreate.png b/docs/source/screenshots/accountcreate.png
deleted file mode 100644
index 26e459a..0000000
Binary files a/docs/source/screenshots/accountcreate.png and /dev/null differ
diff --git a/docs/source/screenshots/accountshome.png b/docs/source/screenshots/accountshome.png
deleted file mode 100644
index 8ac1b45..0000000
Binary files a/docs/source/screenshots/accountshome.png and /dev/null differ
diff --git a/docs/source/screenshots/accountshome1.png b/docs/source/screenshots/accountshome1.png
deleted file mode 100644
index 16c59ad..0000000
Binary files a/docs/source/screenshots/accountshome1.png and /dev/null differ
diff --git a/docs/source/screenshots/casescreate.png b/docs/source/screenshots/casescreate.png
deleted file mode 100644
index 9947165..0000000
Binary files a/docs/source/screenshots/casescreate.png and /dev/null differ
diff --git a/docs/source/screenshots/caseshome.png b/docs/source/screenshots/caseshome.png
deleted file mode 100644
index 2bc19fc..0000000
Binary files a/docs/source/screenshots/caseshome.png and /dev/null differ
diff --git a/docs/source/screenshots/caseshome1.png b/docs/source/screenshots/caseshome1.png
deleted file mode 100644
index 2b0f174..0000000
Binary files a/docs/source/screenshots/caseshome1.png and /dev/null differ
diff --git a/docs/source/screenshots/changepassword.png b/docs/source/screenshots/changepassword.png
deleted file mode 100644
index 215cc18..0000000
Binary files a/docs/source/screenshots/changepassword.png and /dev/null differ
diff --git a/docs/source/screenshots/contactscreate.png b/docs/source/screenshots/contactscreate.png
deleted file mode 100644
index 1aa2133..0000000
Binary files a/docs/source/screenshots/contactscreate.png and /dev/null differ
diff --git a/docs/source/screenshots/contactshome.png b/docs/source/screenshots/contactshome.png
deleted file mode 100644
index a62edeb..0000000
Binary files a/docs/source/screenshots/contactshome.png and /dev/null differ
diff --git a/docs/source/screenshots/contactshome1.png b/docs/source/screenshots/contactshome1.png
deleted file mode 100644
index a9dc672..0000000
Binary files a/docs/source/screenshots/contactshome1.png and /dev/null differ
diff --git a/docs/source/screenshots/createsettings.png b/docs/source/screenshots/createsettings.png
deleted file mode 100644
index d54c91b..0000000
Binary files a/docs/source/screenshots/createsettings.png and /dev/null differ
diff --git a/docs/source/screenshots/createuser.png b/docs/source/screenshots/createuser.png
deleted file mode 100644
index 358d022..0000000
Binary files a/docs/source/screenshots/createuser.png and /dev/null differ
diff --git a/docs/source/screenshots/documentscreate.png b/docs/source/screenshots/documentscreate.png
deleted file mode 100644
index a1fe1c1..0000000
Binary files a/docs/source/screenshots/documentscreate.png and /dev/null differ
diff --git a/docs/source/screenshots/documentshome.png b/docs/source/screenshots/documentshome.png
deleted file mode 100644
index f70bb99..0000000
Binary files a/docs/source/screenshots/documentshome.png and /dev/null differ
diff --git a/docs/source/screenshots/documentshome1.png b/docs/source/screenshots/documentshome1.png
deleted file mode 100644
index da82f85..0000000
Binary files a/docs/source/screenshots/documentshome1.png and /dev/null differ
diff --git a/docs/source/screenshots/dropdown.png b/docs/source/screenshots/dropdown.png
deleted file mode 100644
index c89e8a4..0000000
Binary files a/docs/source/screenshots/dropdown.png and /dev/null differ
diff --git a/docs/source/screenshots/editprofile.png b/docs/source/screenshots/editprofile.png
deleted file mode 100644
index 0fa7f02..0000000
Binary files a/docs/source/screenshots/editprofile.png and /dev/null differ
diff --git a/docs/source/screenshots/edituser.png b/docs/source/screenshots/edituser.png
deleted file mode 100644
index 09e9ad8..0000000
Binary files a/docs/source/screenshots/edituser.png and /dev/null differ
diff --git a/docs/source/screenshots/email.png b/docs/source/screenshots/email.png
deleted file mode 100644
index 43ec746..0000000
Binary files a/docs/source/screenshots/email.png and /dev/null differ
diff --git a/docs/source/screenshots/forgetpasswordpage.png b/docs/source/screenshots/forgetpasswordpage.png
deleted file mode 100644
index e38c91f..0000000
Binary files a/docs/source/screenshots/forgetpasswordpage.png and /dev/null differ
diff --git a/docs/source/screenshots/homepage.png b/docs/source/screenshots/homepage.png
deleted file mode 100644
index 95bdaa3..0000000
Binary files a/docs/source/screenshots/homepage.png and /dev/null differ
diff --git a/docs/source/screenshots/leadscreate.png b/docs/source/screenshots/leadscreate.png
deleted file mode 100644
index e7d5339..0000000
Binary files a/docs/source/screenshots/leadscreate.png and /dev/null differ
diff --git a/docs/source/screenshots/leadshome.png b/docs/source/screenshots/leadshome.png
deleted file mode 100644
index 86782b3..0000000
Binary files a/docs/source/screenshots/leadshome.png and /dev/null differ
diff --git a/docs/source/screenshots/leadshome1.png b/docs/source/screenshots/leadshome1.png
deleted file mode 100644
index 26cf0bb..0000000
Binary files a/docs/source/screenshots/leadshome1.png and /dev/null differ
diff --git a/docs/source/screenshots/login.png b/docs/source/screenshots/login.png
deleted file mode 100644
index b366f5a..0000000
Binary files a/docs/source/screenshots/login.png and /dev/null differ
diff --git a/docs/source/screenshots/mailsent.png b/docs/source/screenshots/mailsent.png
deleted file mode 100644
index e51f149..0000000
Binary files a/docs/source/screenshots/mailsent.png and /dev/null differ
diff --git a/docs/source/screenshots/opportunitycreate.png b/docs/source/screenshots/opportunitycreate.png
deleted file mode 100644
index 630d513..0000000
Binary files a/docs/source/screenshots/opportunitycreate.png and /dev/null differ
diff --git a/docs/source/screenshots/opportunityhome.png b/docs/source/screenshots/opportunityhome.png
deleted file mode 100644
index 810e105..0000000
Binary files a/docs/source/screenshots/opportunityhome.png and /dev/null differ
diff --git a/docs/source/screenshots/opportunityhome1.png b/docs/source/screenshots/opportunityhome1.png
deleted file mode 100644
index 16417bf..0000000
Binary files a/docs/source/screenshots/opportunityhome1.png and /dev/null differ
diff --git a/docs/source/screenshots/profilehome.png b/docs/source/screenshots/profilehome.png
deleted file mode 100644
index 51c7f40..0000000
Binary files a/docs/source/screenshots/profilehome.png and /dev/null differ
diff --git a/docs/source/screenshots/resetpassword.png b/docs/source/screenshots/resetpassword.png
deleted file mode 100644
index 9762a8f..0000000
Binary files a/docs/source/screenshots/resetpassword.png and /dev/null differ
diff --git a/docs/source/screenshots/resetsuccessful.png b/docs/source/screenshots/resetsuccessful.png
deleted file mode 100644
index ae799ff..0000000
Binary files a/docs/source/screenshots/resetsuccessful.png and /dev/null differ
diff --git a/docs/source/screenshots/settingshome.png b/docs/source/screenshots/settingshome.png
deleted file mode 100644
index c5b808e..0000000
Binary files a/docs/source/screenshots/settingshome.png and /dev/null differ
diff --git a/docs/source/screenshots/usershome.png b/docs/source/screenshots/usershome.png
deleted file mode 100644
index fce44cf..0000000
Binary files a/docs/source/screenshots/usershome.png and /dev/null differ
diff --git a/emails/templates/create_mail.html b/emails/templates/create_mail.html
index 314005f..37fa733 100644
--- a/emails/templates/create_mail.html
+++ b/emails/templates/create_mail.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 
 <div class="main_container">
diff --git a/emails/templates/mail_all.html b/emails/templates/mail_all.html
index 53b0498..484b0d0 100644
--- a/emails/templates/mail_all.html
+++ b/emails/templates/mail_all.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block breadcrumb %}
 
diff --git a/emails/templates/mail_center.html b/emails/templates/mail_center.html
index abb3bba..5fbfcc0 100644
--- a/emails/templates/mail_center.html
+++ b/emails/templates/mail_center.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 
 <div class="main_container">
diff --git a/emails/templates/mail_drafts.html b/emails/templates/mail_drafts.html
index 3a70ed1..6ac8a0f 100644
--- a/emails/templates/mail_drafts.html
+++ b/emails/templates/mail_drafts.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block breadcrumb %}
 
diff --git a/emails/templates/mail_important.html b/emails/templates/mail_important.html
index e60c032..441de30 100644
--- a/emails/templates/mail_important.html
+++ b/emails/templates/mail_important.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block breadcrumb %}
 
diff --git a/emails/templates/mail_sent.html b/emails/templates/mail_sent.html
index 997c051..ab5e738 100644
--- a/emails/templates/mail_sent.html
+++ b/emails/templates/mail_sent.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block breadcrumb %}
 
diff --git a/emails/templates/mail_trash.html b/emails/templates/mail_trash.html
index 50feb1b..1952b08 100644
--- a/emails/templates/mail_trash.html
+++ b/emails/templates/mail_trash.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block breadcrumb %}
 
diff --git a/env.md b/env.md
new file mode 100644
index 0000000..3120062
--- /dev/null
+++ b/env.md
@@ -0,0 +1,37 @@
+# Environment variables
+
+SECRETKEY
+ENV_TYPE="dev/live"
+PASSWORD_RESET_MAIL_FROM_USER
+
+# AWS
+AWSBUCKETNAME
+AWSACCESSKEYID
+AWSSECRETACCESSKEY
+AM_ACCESS_KEY
+AM_PASS_KEY
+AWS_REGION
+
+# DB
+DBNAME
+DBUSER
+DBPASSWORD
+DBHOST
+DBPORT
+
+# Sentry
+SENTRY_ENABLED
+SENTRYDSN
+
+# Celery
+CELERY_BROKER_URL
+CELERY_RESULT_BACKEND
+
+#CACHES
+MEMCACHELOCATION
+
+# Sendgrid
+SG_USER
+SG_PWD
+DEFAULT_FROM_EMAIL
+MARKETING_REPLY_EMAIL
\ No newline at end of file
diff --git a/events/templates/event_create.html b/events/templates/event_create.html
index 7ef2963..b4f1b64 100644
--- a/events/templates/event_create.html
+++ b/events/templates/event_create.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/events/templates/event_detail.html b/events/templates/event_detail.html
index 2952060..ad64652 100644
--- a/events/templates/event_detail.html
+++ b/events/templates/event_detail.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block breadcrumb %}
 {% block extralinks %}
diff --git a/events/templates/events_list.html b/events/templates/events_list.html
index d03c5b8..21da54e 100644
--- a/events/templates/events_list.html
+++ b/events/templates/events_list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/invoices/templates/invoice_create_1.html b/invoices/templates/invoice_create_1.html
index 7def8ed..f882700 100644
--- a/invoices/templates/invoice_create_1.html
+++ b/invoices/templates/invoice_create_1.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 {% block extralinks %}
 <style>
diff --git a/invoices/templates/invoices_create.html b/invoices/templates/invoices_create.html
index 95d687e..3d2d3e9 100644
--- a/invoices/templates/invoices_create.html
+++ b/invoices/templates/invoices_create.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/invoices/templates/invoices_detail.html b/invoices/templates/invoices_detail.html
index 062b771..1b1bccf 100644
--- a/invoices/templates/invoices_detail.html
+++ b/invoices/templates/invoices_detail.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block breadcrumb %}
 {% block extralinks %}
diff --git a/invoices/templates/invoices_detail_1.html b/invoices/templates/invoices_detail_1.html
index 13404c5..f2f14a2 100644
--- a/invoices/templates/invoices_detail_1.html
+++ b/invoices/templates/invoices_detail_1.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block breadcrumb %}
diff --git a/invoices/templates/invoices_list.html b/invoices/templates/invoices_list.html
index 0ca3084..9306084 100644
--- a/invoices/templates/invoices_list.html
+++ b/invoices/templates/invoices_list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/leads/templates/checkbox.html b/leads/templates/checkbox.html
index 9f6b75c..0a01a1e 100644
--- a/leads/templates/checkbox.html
+++ b/leads/templates/checkbox.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <form id="formid"  method='POST'  action="{% url 'leads:leads_convert' post.id%}">
   <div class="page-header">
diff --git a/leads/templates/create_lead.html b/leads/templates/create_lead.html
index db529d4..961619d 100644
--- a/leads/templates/create_lead.html
+++ b/leads/templates/create_lead.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/leads/templates/leads.html b/leads/templates/leads.html
index b6e265d..7930cb9 100644
--- a/leads/templates/leads.html
+++ b/leads/templates/leads.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% load cache %}
diff --git a/leads/templates/view_leads.html b/leads/templates/view_leads.html
index ce976fe..a403cdd 100644
--- a/leads/templates/view_leads.html
+++ b/leads/templates/view_leads.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block breadcrumb %}
 
diff --git a/manage_local.py b/manage_local.py
new file mode 100644
index 0000000..e23b489
--- /dev/null
+++ b/manage_local.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "crm.local_settings")
+    os.environ['DJANGO_SETTINGS_MODULE'] = "crm.local_settings"
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError:
+        # The above import may fail for some other reason. Ensure that the
+        # issue is really that Django is missing to avoid masking other
+        # exceptions on Python 2.
+        try:
+            pass
+
+        except ImportError:
+            raise ImportError(
+                "Couldn't import Django. Are you sure it's installed and "
+                "available on your PYTHONPATH environment variable? Did you "
+                "forget to activate a virtual environment?"
+            )
+        raise
+    execute_from_command_line(sys.argv)
diff --git a/marketing/templates/add_blocked_domain.html b/marketing/templates/add_blocked_domain.html
index 6416839..b34af1f 100644
--- a/marketing/templates/add_blocked_domain.html
+++ b/marketing/templates/add_blocked_domain.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 {{ block.super }}
 <nav aria-label="breadcrumb">
diff --git a/marketing/templates/add_blocked_email.html b/marketing/templates/add_blocked_email.html
index 637e375..a90c4ce 100644
--- a/marketing/templates/add_blocked_email.html
+++ b/marketing/templates/add_blocked_email.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 {{ block.super }}
 <nav aria-label="breadcrumb">
diff --git a/marketing/templates/add_email_for_campaign.html b/marketing/templates/add_email_for_campaign.html
index 7ff1a3e..eda2591 100644
--- a/marketing/templates/add_email_for_campaign.html
+++ b/marketing/templates/add_email_for_campaign.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/marketing/templates/blocked_domain_list.html b/marketing/templates/blocked_domain_list.html
index 8d4595f..18cc635 100644
--- a/marketing/templates/blocked_domain_list.html
+++ b/marketing/templates/blocked_domain_list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block content %}
diff --git a/marketing/templates/blocked_email_list.html b/marketing/templates/blocked_email_list.html
index bfe74ba..a0b9d79 100644
--- a/marketing/templates/blocked_email_list.html
+++ b/marketing/templates/blocked_email_list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block content %}
diff --git a/marketing/templates/contact_detail.html b/marketing/templates/contact_detail.html
index fc1b7c6..043b1cf 100644
--- a/marketing/templates/contact_detail.html
+++ b/marketing/templates/contact_detail.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/marketing/templates/email_for_campaigns_list.html b/marketing/templates/email_for_campaigns_list.html
index 1b6b199..7bbb665 100644
--- a/marketing/templates/email_for_campaigns_list.html
+++ b/marketing/templates/email_for_campaigns_list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/marketing/templates/search/search.html b/marketing/templates/search/search.html
index ea145c9..bec36ce 100644
--- a/marketing/templates/search/search.html
+++ b/marketing/templates/search/search.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/marketing/templates/search_contact_emails.html b/marketing/templates/search_contact_emails.html
index 6d3b2b7..030ee90 100644
--- a/marketing/templates/search_contact_emails.html
+++ b/marketing/templates/search_contact_emails.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/opportunity/templates/create_opportunity.html b/opportunity/templates/create_opportunity.html
index 33592e8..c5c6831 100644
--- a/opportunity/templates/create_opportunity.html
+++ b/opportunity/templates/create_opportunity.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/opportunity/templates/opportunity.html b/opportunity/templates/opportunity.html
index 2dbc2dc..8bae1a5 100644
--- a/opportunity/templates/opportunity.html
+++ b/opportunity/templates/opportunity.html
@@ -1,5 +1,5 @@
 {% extends "sales/base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/opportunity/templates/view_opportunity.html b/opportunity/templates/view_opportunity.html
index b83297e..fdd2584 100644
--- a/opportunity/templates/view_opportunity.html
+++ b/opportunity/templates/view_opportunity.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block breadcrumb %}
 {% block extralinks %}
diff --git a/planner/templates/calls.html b/planner/templates/calls.html
index 5572a4f..029eca6 100644
--- a/planner/templates/calls.html
+++ b/planner/templates/calls.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 
 <div class="row marl heading_create">
diff --git a/planner/templates/calls_list.html b/planner/templates/calls_list.html
index fb8c509..081a797 100644
--- a/planner/templates/calls_list.html
+++ b/planner/templates/calls_list.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <table class="table table-bordered table-striped table-condensed">
   <thead>
     <th width="20%">Name</th>
diff --git a/planner/templates/dialog_models.html b/planner/templates/dialog_models.html
index f52dbb3..35cfa7a 100644
--- a/planner/templates/dialog_models.html
+++ b/planner/templates/dialog_models.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 
 <div class="modal fade model-sm" id="selectusersmodel" role="dialog" data-keyboard="false"
   data-backdrop="static">
diff --git a/planner/templates/meetings.html b/planner/templates/meetings.html
index bcf54a8..1963c46 100644
--- a/planner/templates/meetings.html
+++ b/planner/templates/meetings.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 
 <div class="row marl heading_create">
diff --git a/planner/templates/meetings_list.html b/planner/templates/meetings_list.html
index ccf1f4f..f9261d4 100644
--- a/planner/templates/meetings_list.html
+++ b/planner/templates/meetings_list.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <table class="table table-bordered table-striped table-condensed">
   <thead>
     <tr>
diff --git a/planner/templates/reminder.html b/planner/templates/reminder.html
index 18832b0..7fd0a1d 100644
--- a/planner/templates/reminder.html
+++ b/planner/templates/reminder.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div id="reminder1">
   {{ reminder_form_set.management_form }}
   {% for form in reminder_form_set %}
diff --git a/planner/templates/tasks.html b/planner/templates/tasks.html
index ceb2c2d..ff555e9 100644
--- a/planner/templates/tasks.html
+++ b/planner/templates/tasks.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 
 <div class="row marl heading_create">
diff --git a/planner/templates/tasks_list.html b/planner/templates/tasks_list.html
index 0090c64..1fdae54 100644
--- a/planner/templates/tasks_list.html
+++ b/planner/templates/tasks_list.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <table class="table table-bordered table-striped table-condensed">
   <thead>
     <tr>
diff --git a/planner/templates/users.html b/planner/templates/users.html
index 362dfd3..a7a866f 100644
--- a/planner/templates/users.html
+++ b/planner/templates/users.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <table class="table for-pagination-users">
   <thead>
     <tr>
diff --git a/requirements.txt b/requirements.txt
index 40d34ea..f452dd3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,39 +1,44 @@
-amqp==2.5.2
+amqp==2.6.0
 arrow==0.14.5
+asgiref==3.2.7
 atomicwrites==1.3.0
 attrs==19.3.0
 Babel==2.8.0
 billiard==3.6.3.0
 boto==2.49.0
-boto3==1.9.212
-botocore==1.12.253
+boto3==1.13.20
+botocore==1.16.20
 celery==4.3.0
 certifi==2020.4.5.1
 chardet==3.0.4
 codacy-coverage==1.3.11
-coverage==4.5.4
+coverage==5.1
 cssselect==1.1.0
-Django==2.2.10
+Django==3.0.8
 django-appconf==1.0.4
-django-compressor==2.3
-django-haystack==2.8.0
-django-phonenumber-field==2.2.0
+django-compressor==2.4
+django-haystack==2.8.1
+django-libsass==0.8
+django-phonenumber-field==4.0.0
+django-settings-export==1.2.1
 django-simple-pagination==1.3
-django-storages==1.7
+django-storages==1.9.1
 docutils==0.15.2
-elasticsearch==2.3.0
+elasticsearch==7.7.1
 et-xmlfile==1.0.1
-idna==2.8
+idna==2.9
 importlib-metadata==1.6.0
 jdcal==1.4.1
-jmespath==0.9.5
-kombu==4.6.8
+jmespath==0.10.0
+kombu==4.6.9
+libsass==0.20.0
 lxml==4.4.1
 more-itertools==8.2.0
 openpyxl==2.6.3
 packaging==20.3
 pdfkit==0.6.1
 phonenumbers==8.10.4
+Pillow==7.1.2
 pluggy==0.13.1
 psycopg2-binary==2.8.3
 py==1.8.1
@@ -41,23 +46,23 @@ pyparsing==2.4.7
 pytest==5.1.1
 pytest-django==3.5.1
 python-dateutil==2.8.1
+python-dotenv==0.13.0
 python-memcached==1.59
-pytz==2019.3
+pytz==2020.1
 raven==6.10.0
 rcssmin==1.0.6
 redis==3.3.8
 requests==2.22.0
 rjsmin==1.1.0
-s3transfer==0.2.1
+s3transfer==0.3.3
 six==1.14.0
-sorl-thumbnail==12.5.0
+sorl-thumbnail==12.6.3
 sqlparse==0.3.1
 urllib3==1.25.9
 uWSGI==2.0.18
 vine==1.3.0
 wcwidth==0.1.9
-whitenoise==5.0.1
+whitenoise==5.1.0
 xlrd==1.2.0
 xlwt==1.3.0
 zipp==3.1.0
-django-settings-export==1.2.1
diff --git a/tasks/templates/task_create.html b/tasks/templates/task_create.html
index 49d8817..cd0c1d2 100644
--- a/tasks/templates/task_create.html
+++ b/tasks/templates/task_create.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
diff --git a/tasks/templates/task_detail.html b/tasks/templates/task_detail.html
index ebaeb4e..20ff97e 100644
--- a/tasks/templates/task_detail.html
+++ b/tasks/templates/task_detail.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block breadcrumb %}
 {% block extralinks %}
diff --git a/tasks/templates/tasks_tasks_list.html b/tasks/templates/tasks_tasks_list.html
index 920ce48..6cdcb99 100644
--- a/tasks/templates/tasks_tasks_list.html
+++ b/tasks/templates/tasks_tasks_list.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load common_tags %}
 {% load thumbnail %}
diff --git a/teams/templates/team_create.html b/teams/templates/team_create.html
index 9eabc1f..6b7fe58 100644
--- a/teams/templates/team_create.html
+++ b/teams/templates/team_create.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 
 {% block breadcrumb %}
 <nav aria-label="breadcrumb">
diff --git a/teams/templates/team_detail.html b/teams/templates/team_detail.html
index ff89594..5e2557d 100644
--- a/teams/templates/team_detail.html
+++ b/teams/templates/team_detail.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block content%}
 <nav aria-label="breadcrumb">
diff --git a/teams/templates/teams.html b/teams/templates/teams.html
index a15b966..6a18d28 100644
--- a/teams/templates/teams.html
+++ b/teams/templates/teams.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load thumbnail %}
 {% block extralinks %}
diff --git a/templates/403.html b/templates/403.html
index af621ff..a264b0f 100644
--- a/templates/403.html
+++ b/templates/403.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/templates/base.html b/templates/base.html
index cebe371..567bcc0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% load staticfiles %}
+{% load static %}
 {% load compress %}
 {% load thumbnail %}
 <html lang="en">
@@ -88,9 +88,8 @@
       </div>
 
     </div>
-
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
     {% block js_block %}
-    <script src="{% static 'js/index.js' %}"></script>
     {% endblock js_block %}
     <script type="text/javascript">
       $(document).ready(function(){
diff --git a/templates/change_password.html b/templates/change_password.html
index 31ec000..347478f 100644
--- a/templates/change_password.html
+++ b/templates/change_password.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 
 {% block content %}
 <form id="add_form" method="POST" action="" novalidate>
diff --git a/templates/company_login.html b/templates/company_login.html
index f0b60d9..7c16fce 100644
--- a/templates/company_login.html
+++ b/templates/company_login.html
@@ -7,14 +7,13 @@
       <div class="login_block">
         <div class="login_form_block">
           <div class="welcome">{{ APPLICATION_NAME }}</div>
-          <form method="POST" action="">              
+          <form method="POST" action="">
             {% comment %}
             <div class="form-group">
               <input type="text" class="form-control" id="id_sub_domain" placeholder="subdomain.bottle.crm" name="sub_domain" value="{{request.POST.sub_domain}}">
               <span class="error">{{form.sub_domain.errors}}</span>
             </div>
             {% endcomment %}
-            <input type="hidden" name="company" value="{{request.session.company}}">
             <div class="form-group">
               <input type="text" class="form-control" id="exampleInputEmail1" placeholder="email" name="email" value="{{request.POST.email}}">
               <span class="error">{{form.email.errors}}</span>
@@ -30,7 +29,6 @@
             </div>
             <div class="forgot">New Here? <a href="{% url "common:register" %}">Register</a></div>
             <div class="forgot">Forgot Password <a href="{% url "common:password_reset" %}">Click Here?</a></div>
-            
             <button type="submit" class="btn btn-danger">Login</button>
 
           </form>
diff --git a/templates/forgot_password.html b/templates/forgot_password.html
index bff040b..b26e781 100644
--- a/templates/forgot_password.html
+++ b/templates/forgot_password.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load compress %}
 <!DOCTYPE html>
 <html lang="en">
diff --git a/templates/login.html b/templates/login.html
index 269d9aa..23877bb 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load compress %}
 <!DOCTYPE html>
 <html lang="en">
diff --git a/templates/marketing/base.html b/templates/marketing/base.html
index 5644730..da9b34c 100644
--- a/templates/marketing/base.html
+++ b/templates/marketing/base.html
@@ -37,7 +37,7 @@
 
 
 {% extends 'root.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load compress %}
 {% load thumbnail %}
 {% block main_menu %}
diff --git a/templates/marketing/campaign/details.html b/templates/marketing/campaign/details.html
index d3669bd..11d5233 100644
--- a/templates/marketing/campaign/details.html
+++ b/templates/marketing/campaign/details.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load common_tags %}
 {% block content %}
diff --git a/templates/marketing/campaign/index.html b/templates/marketing/campaign/index.html
index b21db65..2d70378 100644
--- a/templates/marketing/campaign/index.html
+++ b/templates/marketing/campaign/index.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load common_tags %}
 {% block content %}
diff --git a/templates/marketing/campaign/new.html b/templates/marketing/campaign/new.html
index 2831f58..7c12c02 100644
--- a/templates/marketing/campaign/new.html
+++ b/templates/marketing/campaign/new.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/templates/marketing/dashboard.html b/templates/marketing/dashboard.html
index f46b33b..ed9048c 100644
--- a/templates/marketing/dashboard.html
+++ b/templates/marketing/dashboard.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load common_tags %}
 {% load paginate %}
 {% block extralinks %} 
diff --git a/templates/marketing/email_template/details.html b/templates/marketing/email_template/details.html
index d051d24..4effd02 100644
--- a/templates/marketing/email_template/details.html
+++ b/templates/marketing/email_template/details.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block extralinks %}
 <style>
diff --git a/templates/marketing/email_template/index.html b/templates/marketing/email_template/index.html
index 8497563..a47f116 100644
--- a/templates/marketing/email_template/index.html
+++ b/templates/marketing/email_template/index.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/templates/marketing/email_template/new.html b/templates/marketing/email_template/new.html
index 6a1c14c..d9f88db 100644
--- a/templates/marketing/email_template/new.html
+++ b/templates/marketing/email_template/new.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% block content %}
 {{ block.super }}
 <nav aria-label="breadcrumb">
diff --git a/templates/marketing/lists/all.html b/templates/marketing/lists/all.html
index 8b99285..e349a34 100644
--- a/templates/marketing/lists/all.html
+++ b/templates/marketing/lists/all.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/templates/marketing/lists/cnew.html b/templates/marketing/lists/cnew.html
index 50b56cd..6fa57c7 100644
--- a/templates/marketing/lists/cnew.html
+++ b/templates/marketing/lists/cnew.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }} 
diff --git a/templates/marketing/lists/detail.html b/templates/marketing/lists/detail.html
index 99b60d4..cdc6e82 100644
--- a/templates/marketing/lists/detail.html
+++ b/templates/marketing/lists/detail.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% load digg_paginator %}
 {% block content %}
diff --git a/templates/marketing/lists/edit_contact.html b/templates/marketing/lists/edit_contact.html
index 2f00a4a..ed878b2 100644
--- a/templates/marketing/lists/edit_contact.html
+++ b/templates/marketing/lists/edit_contact.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/templates/marketing/lists/failed_detail.html b/templates/marketing/lists/failed_detail.html
index 10ca0e3..20d2f6d 100644
--- a/templates/marketing/lists/failed_detail.html
+++ b/templates/marketing/lists/failed_detail.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/templates/marketing/lists/index.html b/templates/marketing/lists/index.html
index 3b77344..dd17592 100644
--- a/templates/marketing/lists/index.html
+++ b/templates/marketing/lists/index.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block content %}
 {{ block.super }}
diff --git a/templates/marketing/lists/new.html b/templates/marketing/lists/new.html
index 5e203e6..ee18cf4 100644
--- a/templates/marketing/lists/new.html
+++ b/templates/marketing/lists/new.html
@@ -1,5 +1,5 @@
 {% extends 'marketing/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load paginate %}
 {% block extralinks %}
 <link href="https://cdnjs.cloudflare.com/ajax/libs/jquery-tagsinput/1.3.6/jquery.tagsinput.min.css" rel="stylesheet">
diff --git a/templates/profile.html b/templates/profile.html
index d9bc434..e0633d7 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block content%}
 
diff --git a/templates/registration/base.html b/templates/registration/base.html
index 8962b00..c475a4b 100644
--- a/templates/registration/base.html
+++ b/templates/registration/base.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load compress %}
 <!DOCTYPE html>
 <html lang="en">
diff --git a/templates/root.html b/templates/root.html
index 170f5f2..1f58f75 100644
--- a/templates/root.html
+++ b/templates/root.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load compress %}
 {% load thumbnail %}
 <!DOCTYPE html>
@@ -172,8 +172,6 @@
 
 <script src="{% static 'js/bootstrap-suggest.js' %}"></script>
 
-<script src="{% static 'js/index.js' %}"></script>
-
   {% block js_block %}{% endblock js_block %}
   <script type="text/javascript">
     $(document).ready(function () {
diff --git a/templates/sales/index.html b/templates/sales/index.html
index cfd0983..bd08517 100644
--- a/templates/sales/index.html
+++ b/templates/sales/index.html
@@ -1,5 +1,5 @@
 {% extends 'sales/base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load thumbnail %}
 {% block extralinks %} 
 <style>