diff --git a/docs/source/advanced.rst b/docs/source/advanced.rst
index e40def6..7815102 100644
--- a/docs/source/advanced.rst
+++ b/docs/source/advanced.rst
@@ -50,3 +50,18 @@ associated environment variable, or in the argument, which overrides all other s
 
     auth = Authenticator(config, user_klass=MyUserClass)
 
+Customising the UI
+~~~~~~~~~~~~~~~~~~
+
+The UI templates are rendered using Jinja2 Templates, with a customisation from :py:class:`~fastapi_aad_auth.ui.jinja.Jinja2Templates`
+that uses a loader that allows a package resource to be used in place of a file (using ``{% extends <package>:<resource> %}``).
+
+Additionally, the :py:class:`~fastapi_aad_auth.config.LoginUIConfig` has an attribute ``ui_klass`` that can be used to customise how
+the context is built (note that this class should inherit from (or duck-type the public API of) :class:`~fastapi_aad_auth.ui.UI`)
+
+These jinja templates also are structured (see :doc:`module/fastapi_aad_auth.ui` docs for the other templates) from a base template that is relatively generic:
+
+.. literalinclude:: ../../src/fastapi_aad_auth/ui/base.html
+    :language: html
+
+And can easily be extended or customised.
diff --git a/docs/source/module/fastapi_aad_auth.ui.base.html.rst b/docs/source/module/fastapi_aad_auth.ui.base.html.rst
new file mode 100644
index 0000000..6a38fdd
--- /dev/null
+++ b/docs/source/module/fastapi_aad_auth.ui.base.html.rst
@@ -0,0 +1,5 @@
+fastapi_aad_auth.ui:base.html
+*****************************
+
+.. literalinclude:: ../../../src/fastapi_aad_auth/ui/base.html
+    :language: html
diff --git a/docs/source/module/fastapi_aad_auth.ui.error.html.rst b/docs/source/module/fastapi_aad_auth.ui.error.html.rst
new file mode 100644
index 0000000..b3bd903
--- /dev/null
+++ b/docs/source/module/fastapi_aad_auth.ui.error.html.rst
@@ -0,0 +1,5 @@
+fastapi_aad_auth.ui:error.html
+******************************
+
+.. literalinclude:: ../../../src/fastapi_aad_auth/ui/error.html
+    :language: html
diff --git a/docs/source/module/fastapi_aad_auth.ui.jinja.rst b/docs/source/module/fastapi_aad_auth.ui.jinja.rst
new file mode 100644
index 0000000..97fb100
--- /dev/null
+++ b/docs/source/module/fastapi_aad_auth.ui.jinja.rst
@@ -0,0 +1,5 @@
+fastapi_aad_auth.ui.jinja
+*************************
+
+.. automodule:: fastapi_aad_auth.ui.jinja
+    :members:
diff --git a/docs/source/module/fastapi_aad_auth.ui.login.html.rst b/docs/source/module/fastapi_aad_auth.ui.login.html.rst
new file mode 100644
index 0000000..46fec4d
--- /dev/null
+++ b/docs/source/module/fastapi_aad_auth.ui.login.html.rst
@@ -0,0 +1,5 @@
+fastapi_aad_auth.ui:login.html
+******************************
+
+.. literalinclude:: ../../../src/fastapi_aad_auth/ui/login.html
+    :language: html
diff --git a/docs/source/module/fastapi_aad_auth.ui.rst b/docs/source/module/fastapi_aad_auth.ui.rst
index d285728..d8c0379 100644
--- a/docs/source/module/fastapi_aad_auth.ui.rst
+++ b/docs/source/module/fastapi_aad_auth.ui.rst
@@ -2,3 +2,14 @@ fastapi_aad_auth.ui
 *******************
 
 .. automodule:: fastapi_aad_auth.ui
+    :members:
+
+.. toctree::
+    :caption: Sub-modules:
+    :maxdepth: 1
+    
+    fastapi_aad_auth.ui.jinja
+    fastapi_aad_auth.ui.base.html
+    fastapi_aad_auth.ui.error.html
+    fastapi_aad_auth.ui.login.html
+    fastapi_aad_auth.ui.user.html
diff --git a/docs/source/module/fastapi_aad_auth.ui.user.html.rst b/docs/source/module/fastapi_aad_auth.ui.user.html.rst
new file mode 100644
index 0000000..68d3af5
--- /dev/null
+++ b/docs/source/module/fastapi_aad_auth.ui.user.html.rst
@@ -0,0 +1,5 @@
+fastapi_aad_auth.ui:user.html
+*****************************
+
+.. literalinclude:: ../../../src/fastapi_aad_auth/ui/user.html
+    :language: html
diff --git a/src/fastapi_aad_auth/auth.py b/src/fastapi_aad_auth/auth.py
index 4511dd4..59cafc7 100644
--- a/src/fastapi_aad_auth/auth.py
+++ b/src/fastapi_aad_auth/auth.py
@@ -3,22 +3,20 @@
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
-from fastapi import Depends, FastAPI
+from fastapi import FastAPI
 from starlette.authentication import requires
 from starlette.middleware.authentication import AuthenticationError, AuthenticationMiddleware
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.requests import Request
-from starlette.responses import JSONResponse, RedirectResponse, Response
-from starlette.routing import Mount, request_response, Route
-from starlette.staticfiles import StaticFiles
-from starlette.templating import Jinja2Templates
+from starlette.responses import RedirectResponse, Response
+from starlette.routing import request_response, Route
 
 from fastapi_aad_auth._base.backend import BaseOAuthBackend
-from fastapi_aad_auth._base.state import AuthenticationState
 from fastapi_aad_auth._base.validators import SessionValidator
 from fastapi_aad_auth.config import Config
 from fastapi_aad_auth.errors import base_error_handler, ConfigurationError
 from fastapi_aad_auth.mixins import LoggingMixin
+from fastapi_aad_auth.ui.jinja import Jinja2Templates
 from fastapi_aad_auth.utilities import deprecate
 
 
@@ -31,12 +29,14 @@ class Authenticator(LoggingMixin):
     Creates the key components based on the provided configurations
     """
 
-    def __init__(self, config: Config = None, add_to_base_routes: bool = True, base_context: Dict[str, Any] = None, user_klass: Optional[type] = None):
-        """Initialise the AAD config based on the provided configuration.
+    def __init__(self, config: Config = None, add_to_base_routes: bool = True, base_context: Optional[Dict[str, Any]] = None, user_klass: Optional[type] = None):
+        """Initialise the Authenticator based on the provided configuration.
 
         Keyword Args:
             config (fastapi_aad_auth.config.Config): Authentication configuration (includes ui and routing, as well as AAD Application and Tenant IDs)
             add_to_base_routes (bool): Add the authentication to the router
+            base_context (Dict[str, Any]): a base context to provide
+            user_klass (type): The user class to use as part of the auth state
         """
         super().__init__()
         if config is None:
@@ -74,65 +74,8 @@ def _init_auth_backend(self):
         return BaseOAuthBackend(validators)
 
     def _init_ui(self):
-        login_template_path = Path(self.config.login_ui.template_file)
-        user_template_path = Path(self.config.login_ui.user_template_file)
-        login_templates = Jinja2Templates(directory=str(login_template_path.parent))
-        user_templates = Jinja2Templates(directory=str(user_template_path.parent))
-
-        async def login(request: Request, *args, **kwargs):
-            context = self._base_context.copy()  # type: ignore
-            if not self.config.enabled or request.user.is_authenticated:
-                # This is authenticated so go straight to the homepage
-                return RedirectResponse(self.config.routing.home_path)
-            context['request'] = request  # type: ignore
-            if 'login' not in context or context['login'] is None:  # type: ignore
-                post_redirect = self._session_validator.pop_post_auth_redirect(request)
-                context['login'] = '<br>'.join([provider.get_login_button(post_redirect) for provider in self._providers])  # type: ignore
-            return login_templates.TemplateResponse(login_template_path.name, context)  # type: ignore
-
-        routes = [Route(self.config.routing.landing_path, endpoint=login, methods=['GET'], name='login'),
-                  Mount(self.config.login_ui.static_path, StaticFiles(directory=str(self.config.login_ui.static_directory)), name='static-login')]
-
-        if self.config.routing.user_path:
-
-            @self.auth_required()
-            async def get_user(request: Request):
-                context = self._base_context.copy()  # type: ignore
-                self.logger.debug(f'Getting token for {request.user}')
-                context['request'] = request  # type: ignore
-                if self.config.enabled:
-                    self.logger.debug(f'Auth {request.auth}')
-                    try:
-                        context['user'] = self._session_validator.get_state_from_session(request).user
-                    except ValueError:
-                        # If we have one provider, we can force the login, otherwise...
-                        return self.__force_authenticate(request)
-                else:
-                    self.logger.debug('Auth not enabled')
-                    context['token'] = None  # type: ignore
-                return user_templates.TemplateResponse(user_template_path.name, context)
-
-            async def get_token(request: Request, auth_state: AuthenticationState = Depends(self.auth_backend)):
-                if not isinstance(auth_state, AuthenticationState):
-                    user = self.__get_user_from_request(request)
-                else:
-                    user = auth_state.user
-                if hasattr(user, 'username'):  # type: ignore
-                    access_token = self.__get_access_token(user)
-                    if access_token:
-                        # We want to get the token for each provider that is authenticated
-                        return JSONResponse(access_token)   # type: ignore
-                    else:
-                        if any([u in request.headers['user-agent'] for u in ['Mozilla', 'Gecko', 'Trident', 'WebKit', 'Presto', 'Edge', 'Blink']]):
-                            # If we have one provider, we can force the login, otherwise we need to request which login route
-                            return self.__force_authenticate(request)
-                        else:
-                            return JSONResponse('Unable to access token as user has not authenticated via session')
-                return RedirectResponse(f'{self.config.routing.landing_path}?redirect=/me/token')
-
-            routes += [Route(self.config.routing.user_path, endpoint=get_user, methods=['GET'], name='user'),
-                       Route(f'{self.config.routing.user_path}/token', endpoint=get_token, methods=['GET'], name='get-token')]
-        return routes
+        ui = self.config.login_ui.ui_klass(self.config, self, self._base_context)
+        return ui.routes
 
     def _init_auth_routes(self):
 
@@ -150,30 +93,6 @@ async def logout(request: Request):
         # We have a deprecated behaviour here
         return routes
 
-    def __force_authenticate(self, request: Request):
-        if len(self._providers) == 1:
-            return self._providers[0].authenticator.process_login_request(request, force=True, redirect=request.url.path)
-        else:
-            return RedirectResponse(f'{self.config.routing.landing_path}?redirect={request.url.path}')
-
-    def __get_access_token(self, user):
-        access_token = None
-        while access_token is None:
-            provider = next(self._providers)
-            try:
-                access_token = provider.autheticator.get_access_token(user)
-            except ValueError:
-                pass
-        return access_token
-
-    def __get_user_from_request(self, request: Request):
-        if hasattr(request.user, 'username'):
-            user = request.user
-        else:
-            auth_state = self.auth_backend.check(request)
-            user = auth_state.user
-        return user
-
     def _set_error_handlers(self, app):
         error_template_path = Path(self.config.login_ui.error_template_file)
         error_templates = Jinja2Templates(directory=str(error_template_path.parent))
diff --git a/src/fastapi_aad_auth/config.py b/src/fastapi_aad_auth/config.py
index 96c995f..1196e0f 100644
--- a/src/fastapi_aad_auth/config.py
+++ b/src/fastapi_aad_auth/config.py
@@ -1,5 +1,4 @@
 """fastapi_aad_auth configuration options."""
-import importlib
 from typing import Dict, List, Optional, Union
 import uuid
 
@@ -7,7 +6,7 @@
 from pydantic import BaseSettings as _BaseSettings, DirectoryPath, Field, FilePath, SecretStr, validator
 
 from fastapi_aad_auth.providers.aad import AADConfig
-from fastapi_aad_auth.utilities import bool_from_env, DeprecatableFieldsMixin, DeprecatedField, expand_doc
+from fastapi_aad_auth.utilities import bool_from_env, DeprecatableFieldsMixin, DeprecatedField, expand_doc, klass_from_str
 
 
 class BaseSettings(DeprecatableFieldsMixin, _BaseSettings):
@@ -74,10 +73,15 @@ class LoginUIConfig(BaseSettings):
                              description="Path to mount the login static dir in",
                              env='FASTAPI_AUTH_LOGIN_STATIC_PATH')
     context: Optional[Dict[str, str]] = Field(None, description="Any additional context variables required for the template")
+    ui_klass: type = Field('fastapi_aad_auth.ui:UI',
+                           description="UI class to use to handle creating and returning the routes for the login, error and user screens, this will be treated as an import path "
+                           "if provided as a string, with the last part the class to load", env='FASTAPI_AUTH_UI_KLASS')
 
     class Config:  # noqa D106
         env_file = '.env'
 
+    _validate_klass = validator('ui_klass', pre=True, always=True, allow_reuse=True)(klass_from_str)
+
 
 @expand_doc
 class AuthSessionConfig(BaseSettings):
@@ -122,7 +126,10 @@ class Config:  # noqa D106
 
 @expand_doc
 class Config(BaseSettings):
-    """The overall configuration for the AAD authentication."""
+    """The overall configuration for the AAD authentication.
+
+    Provides the overall configuration and parameters.
+    """
 
     enabled: bool = Field(True, description="Enable authentication", env='FASTAPI_AUTH_ENABLED')
     providers: List[Union[AADConfig]] = Field(None, description="The provider configurations to use")
@@ -175,17 +182,5 @@ def _validate_login_ui(cls, value):
             value = LoginUIConfig(_env_file=cls.Config.env_file)
         return value
 
-    @validator('user_klass', pre=True, always=True)
-    def _validate_klass(cls, value):
-        if isinstance(value, str):
-            if ':' in value:
-                module_name, klass_name = value.split(':')
-            else:
-                split_path = value.split('.')
-                module_name = '.'.join(split_path[:-1])
-                klass_name = split_path[-1]
-            module = importlib.import_module(module_name)
-            value = getattr(module, klass_name)
-        return value
-
+    _validate_klass = validator('user_klass', pre=True, always=True, allow_reuse=True)(klass_from_str)
     _validate_enabled = validator('enabled', allow_reuse=True)(bool_from_env)
diff --git a/src/fastapi_aad_auth/ui/__init__.py b/src/fastapi_aad_auth/ui/__init__.py
index 47cb79c..713af00 100644
--- a/src/fastapi_aad_auth/ui/__init__.py
+++ b/src/fastapi_aad_auth/ui/__init__.py
@@ -7,3 +7,149 @@
     * ``login.html``: Login page for UI login
     * ``user.html``: View the user's information and get an access token
 """
+from pathlib import Path
+from typing import Any, Dict
+
+from fastapi import Depends
+from starlette.requests import Request
+from starlette.responses import JSONResponse, RedirectResponse
+from starlette.routing import Mount, Route
+from starlette.staticfiles import StaticFiles
+
+
+from fastapi_aad_auth import auth, config  # noqa: F401
+from fastapi_aad_auth._base.state import AuthenticationState
+from fastapi_aad_auth.mixins import LoggingMixin
+from fastapi_aad_auth.ui.jinja import Jinja2Templates
+
+
+class UI(LoggingMixin):
+    """Provides Login endpoint methods, which are then wrapped in a factory method."""
+    def __init__(self, config: 'config.Config', authenticator: 'auth.Authenticator', base_context: Dict[str, Any] = None):
+        """Initialise the UI based on the provided configuration.
+
+        Keyword Args:
+            config (fastapi_aad_auth.config.Config): Authentication configuration (includes ui and routing, as well as AAD Application and Tenant IDs)
+            authenticator (fastapi_aad_auth.auth.Authenticator): The authenticator object
+            base_context (Dict[str, Any]): Add the authentication to the router
+        """
+        super().__init__()
+        self.config = config
+        if base_context is None:
+            base_context = dict()
+        self._base_context = base_context
+        self._authenticator = authenticator
+
+        self.login_template_path = Path(self.config.login_ui.template_file)
+        self.user_template_path = Path(self.config.login_ui.user_template_file)
+        self.login_templates = Jinja2Templates(directory=str(self.login_template_path.parent))
+        self.user_templates = Jinja2Templates(directory=str(self.user_template_path.parent))
+
+    def _login(self, request: Request, *args, **kwargs):
+        """Provide the Login UI."""
+
+        context = self._base_context.copy()
+        context.update(kwargs)  # type: ignore
+        if 'app_name' not in context:
+            context['app_name'] = self.config.login_ui.app_name
+        if not self.config.enabled or request.user.is_authenticated:
+            # This is authenticated so go straight to the homepage
+            return RedirectResponse(self.config.routing.home_path)
+        context['request'] = request  # type: ignore
+        if 'login' not in context or context['login'] is None:  # type: ignore
+            post_redirect = self._authenticator._session_validator.pop_post_auth_redirect(request)
+            context['login'] = '<br>'.join([provider.get_login_button(post_redirect) for provider in self._authenticator._providers])  # type: ignore
+        return self.login_templates.TemplateResponse(self.login_template_path.name, context)  # type: ignore
+
+    def _get_user(self, request: Request, **kwargs):
+        """Provide a UI with information on the user."""
+        context = self._base_context.copy()  # type: ignore
+        context.update(kwargs)
+        if 'app_name' not in context:
+            context['app_name'] = self.config.login_ui.app_name
+        self.logger.debug(f'Getting token for {request.user}')
+        context['request'] = request  # type: ignore
+        context['token_api_path'] = f'{self.config.routing.user_path}/token'
+        if self.config.enabled:
+            self.logger.debug(f'Auth {request.auth}')
+            try:
+                context['user'] = self._authenticator._session_validator.get_state_from_session(request).user
+            except ValueError:
+                # If we have one provider, we can force the login, otherwise...
+                return self.__force_authenticate(request)
+        else:
+            self.logger.debug('Auth not enabled')
+            context['token'] = None  # type: ignore
+        return self.user_templates.TemplateResponse(self.user_template_path.name, context)
+
+    def _get_token(self, request: Request, auth_state: AuthenticationState):
+        """Return the access token for the user."""
+        if not isinstance(auth_state, AuthenticationState):
+            user = self.__get_user_from_request(request)
+        else:
+            user = auth_state.user
+        if hasattr(user, 'username'):  # type: ignore
+            access_token = self.__get_access_token(user)
+            if access_token:
+                # We want to get the token for each provider that is authenticated
+                return JSONResponse(access_token)   # type: ignore
+            else:
+                if any([u in request.headers['user-agent'] for u in ['Mozilla', 'Gecko', 'Trident', 'WebKit', 'Presto', 'Edge', 'Blink']]):
+                    # If we have one provider, we can force the login, otherwise we need to request which login route
+                    return self.__force_authenticate(request)
+                else:
+                    return JSONResponse('Unable to access token as user has not authenticated via session')
+        return RedirectResponse(f'{self.config.routing.landing_path}?redirect=/me/token')
+
+    @property
+    def routes(self):
+        """Return the routes for the UI.
+
+        Provides the login UI route, and if the routing config has
+        the ``user_path`` set, it also provides the user description
+        view (and token endpoint)
+        """
+        async def login(request: Request, *args, **kwargs):
+            return self._login(request)
+
+        routes = [Route(self.config.routing.landing_path, endpoint=login, methods=['GET'], name='login'),
+                  Mount(self.config.login_ui.static_path, StaticFiles(directory=str(self.config.login_ui.static_directory)), name='static-login')]
+
+        if self.config.routing.user_path:
+
+            @self._authenticator.auth_required()
+            async def get_user(request: Request):
+                return self._get_user(request)
+
+            async def get_token(request: Request, auth_state: AuthenticationState = Depends(self._authenticator.auth_backend)):
+                return self._get_token(request, auth_state)
+
+            routes += [Route(self.config.routing.user_path, endpoint=get_user, methods=['GET'], name='user'),
+                       Route(f'{self.config.routing.user_path}/token', endpoint=get_token, methods=['GET'], name='get-token')]
+
+        return routes
+
+    def __force_authenticate(self, request: Request):
+        if len(self._authenticator._providers) == 1:
+            return self._authenticator._providers[0].authenticator.process_login_request(request, force=True, redirect=request.url.path)
+        else:
+            return RedirectResponse(f'{self.config.routing.landing_path}?redirect={request.url.path}')
+
+    def __get_access_token(self, user):
+        access_token = None
+        for provider in self._authenticator._providers:
+            try:
+                access_token = provider.authenticator.get_access_token(user)
+            except ValueError:
+                pass
+            if access_token is not None:
+                break
+        return access_token
+
+    def __get_user_from_request(self, request: Request):
+        if hasattr(request.user, 'username'):
+            user = request.user
+        else:
+            auth_state = self._authenticator.auth_backend.check(request)
+            user = auth_state.user
+        return user
diff --git a/src/fastapi_aad_auth/ui/base.html b/src/fastapi_aad_auth/ui/base.html
new file mode 100644
index 0000000..7aee4b8
--- /dev/null
+++ b/src/fastapi_aad_auth/ui/base.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+    {% block Head %}
+        <title>{{app_name}}</title>
+        <meta charset="UTF-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        {% block CSS %}
+        <link href="{{static_path}}/css/bootstrap.min.css" rel="stylesheet">
+        <link rel="stylesheet" href="{{static_path}}/css/cover.css">
+        {% endblock CSS %}
+        {% block Favicon %}
+        <link rel="icon" type="img/ipng" href="/static/img/favicon.png" />
+        {% endblock Favicon %}
+        <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1" >
+        {% block HeadScripts %}
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+        {% endblock HeadScripts %}
+    {% endblock Head %}
+    </head>
+    <body>
+    {% block Body %}
+        {% block Nav %}
+        {% endblock Nav %}
+        {% block Content %}
+        {% endblock Content %}
+        {% block Footer %}
+        {% endblock Footer %}
+        {% block BodyScripts %}
+        {% endblock BodyScripts %}
+    {% endblock Body %}
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/fastapi_aad_auth/ui/error.html b/src/fastapi_aad_auth/ui/error.html
index c48c5a8..2edfa70 100644
--- a/src/fastapi_aad_auth/ui/error.html
+++ b/src/fastapi_aad_auth/ui/error.html
@@ -1,17 +1,5 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <title>{{app_name}}</title>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="{{static_path}}/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="{{static_path}}/css/cover.css">
-        <link rel="icon" type="img/ipng" href="/static/img/favicon.png" />
-        <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1" >
-        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    </head>
-    <body>
+{% extends "base.html" %}
+{% block Content %}
         <main class='container' role="main">
             {% if logo %}
                 {{logo | safe }}
@@ -39,7 +27,5 @@ <h3> {{error_type}}</h3>
                 <p class="mt-5 mb-3 lead text-muted">{{ explanation }}</p>
             {% endif %}
         
-            </main>
-        </div><!-- /.container-fluid -->
-    </body>
-</html>
\ No newline at end of file
+        </main>
+{% block Content %}
diff --git a/src/fastapi_aad_auth/ui/jinja.py b/src/fastapi_aad_auth/ui/jinja.py
new file mode 100644
index 0000000..65ca0df
--- /dev/null
+++ b/src/fastapi_aad_auth/ui/jinja.py
@@ -0,0 +1,33 @@
+"""Provide Jinja2 Helpers."""
+from jinja2 import BaseLoader, ChoiceLoader, Environment, TemplateNotFound
+from pkg_resources import resource_string
+from starlette.templating import Jinja2Templates as _Jinja2Templates
+
+
+class PkgResourcesTemplateLoader(BaseLoader):
+    """Load jinja templates via pkg_resources."""
+
+    @staticmethod
+    def get_source(environment: Environment, template: str):
+        """Load the template via package resources."""
+        source = None
+        if ':' in template:
+            pkg, resource = template.split(':')
+            try:
+                source = resource_string(pkg, resource).decode()
+            except FileNotFoundError:
+                pass
+        if source is None:
+            raise TemplateNotFound(template)
+        return source, None, lambda: True
+
+
+class Jinja2Templates(_Jinja2Templates):  # noqa: D101
+    __doc__ = _Jinja2Templates.__doc__
+
+    def get_env(self, directory: str) -> Environment:
+        """Get the environment."""
+        env = super().get_env(directory)
+        # We want to setup the choice loader here
+        env.loader = ChoiceLoader([PkgResourcesTemplateLoader(), env.loader])
+        return env
diff --git a/src/fastapi_aad_auth/ui/login.html b/src/fastapi_aad_auth/ui/login.html
index 87874b2..7f8914c 100644
--- a/src/fastapi_aad_auth/ui/login.html
+++ b/src/fastapi_aad_auth/ui/login.html
@@ -1,17 +1,5 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <title>{{app_name}}</title>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="{{static_path}}/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="{{static_path}}/css/cover.css">
-        <link rel="icon" type="img/ipng" href="/static/img/favicon.png" />
-        <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1" >
-        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    </head>
-    <body>
+{% extends "base.html" %}
+{% block Content %}
         <div class='container'>
             <div class="cover-container d-flex h-100 p-3 mx-auto flex-column text-center justify-content-center">
                 <main class="inner-cover">
@@ -35,6 +23,5 @@ <h4 class="mb-3 font-weight-normal">Please sign in</h4>
             
                 </main>
             </div>
-        </div><!-- /.container-fluid -->
-    </body>
-</html>
\ No newline at end of file
+        </div>
+{% endblock Content %}
\ No newline at end of file
diff --git a/src/fastapi_aad_auth/ui/user.html b/src/fastapi_aad_auth/ui/user.html
index 0a3576e..0aa084a 100644
--- a/src/fastapi_aad_auth/ui/user.html
+++ b/src/fastapi_aad_auth/ui/user.html
@@ -1,18 +1,11 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <title>{{app_name}}</title>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="{{static_path}}/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="{{static_path}}/css/cover.css">
+{% extends "base.html" %}
+
+{% block CSS %}
+        {{ super() }}
         <link href="{{static_path}}/css/open-iconic-bootstrap.css" rel="stylesheet">
-        <link rel="icon" type="img/ipng" href="/static/img/favicon.png" />
-        <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1" >
-        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    </head>
-    <body>
+{% endblock CSS %}
+
+{% block Content %}
         <div class='container'>
             <div class="cover-container d-flex h-5 p-3 mx-auto flex-column text-center justify-content-center">
                 <main class="inner-cover">
@@ -50,16 +43,16 @@ <h2>Current User</h2>
                         
                         <tr class="d-flex">
                         <th class="col-2" scope="row">Roles</th>
-                        <td class="col-10">{{user.roles|join(", ")}}</td>
+                        <td class="col-10">{% if user.roles %}{{user.roles|join(", ")}}{% endif %}</td>
                         </tr>
                         
                         <tr class="d-flex">
                         <th class="col-2" scope="row">Groups</th>
-                        <td class="col-10">{{user.groups|join(", ")}}</td>
+                        <td class="col-10">{% if user.groups %}{{user.groups|join(", ")}}{% endif %}</td>
                         </tr>
                         <tr class="d-flex bg-success">
                         <th class="col-2" scope="row">Permissions</th>
-                        <td class="col-10"><i>{{user.permissions | join("</i>, <i>") | safe}}</i></td>
+                        <td class="col-10"><i>{% if user.permissions %}{{user.permissions | join("</i>, <i>") | safe}}{% endif %}</i></td>
                         </tr>
                         
                         <tr class="d-flex">
@@ -89,14 +82,15 @@ <h2>Current User</h2>
                 <p class="mt-5 mb-3 lead text-muted">{{ explanation }}</p>
             {% endif %}
         </div>
-
+{% endblock Content %}
+{% block BodyScripts %}
         <script>
             $(document).ready(function(){
               $('#tokenText').val('*********');
               $('#expires').text("");
               $("#loadToken").click(function(e){          
                 if (!e.currentTarget.classList.contains("active")){
-                  $.ajax("/me/token").done(function(data){
+                  $.ajax("{{token_api_path}}").done(function(data){
                     $('#tokenText').val(data['access_token']);
                     var expires = new Date();
                     console.log(expires);
@@ -115,6 +109,4 @@ <h2>Current User</h2>
                 }})});
 
           </script>
-
-    </body>
-</html>
+{% endblock BodyScripts %}
diff --git a/src/fastapi_aad_auth/utilities/__init__.py b/src/fastapi_aad_auth/utilities/__init__.py
index f3ad11d..71830fb 100644
--- a/src/fastapi_aad_auth/utilities/__init__.py
+++ b/src/fastapi_aad_auth/utilities/__init__.py
@@ -1,4 +1,6 @@
 """Utilities."""
+import importlib
+
 from fastapi_aad_auth.utilities import logging  # noqa: F401
 from fastapi_aad_auth.utilities import urls  # noqa: F401
 from fastapi_aad_auth.utilities.deprecate import DeprecatableFieldsMixin, deprecate, deprecate_module, DeprecatedField, is_deprecated  # noqa: F401
@@ -18,6 +20,20 @@ def list_from_env(env_value):
     return env_value
 
 
+def klass_from_str(value):
+    """Convert an import path to a class."""
+    if isinstance(value, str):
+        if ':' in value:
+            module_name, klass_name = value.split(':')
+        else:
+            split_path = value.split('.')
+            module_name = '.'.join(split_path[:-1])
+            klass_name = split_path[-1]
+        module = importlib.import_module(module_name)
+        value = getattr(module, klass_name)
+    return value
+
+
 def expand_doc(klass):
     """Expand pydantic model documentation to enable autodoc."""
     docs = ['', '', 'Keyword Args:']