diff --git a/stock/templates/registered/characternotexisting.html b/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
similarity index 100%
rename from stock/templates/registered/characternotexisting.html
rename to fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
diff --git a/stock/templates/registered/fatlinkformatter.html b/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
similarity index 100%
rename from stock/templates/registered/fatlinkformatter.html
rename to fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
diff --git a/stock/templates/registered/fatlinkmodify.html b/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
similarity index 100%
rename from stock/templates/registered/fatlinkmodify.html
rename to fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
diff --git a/stock/templates/registered/fatlinkpersonalmonthlystatisticsview.html b/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
similarity index 100%
rename from stock/templates/registered/fatlinkpersonalmonthlystatisticsview.html
rename to fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
diff --git a/stock/templates/registered/fatlinkpersonalstatisticsview.html b/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
similarity index 100%
rename from stock/templates/registered/fatlinkpersonalstatisticsview.html
rename to fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
diff --git a/stock/templates/registered/fatlinkstatisticsview.html b/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
similarity index 100%
rename from stock/templates/registered/fatlinkstatisticsview.html
rename to fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
diff --git a/stock/templates/registered/fatlinkview.html b/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
similarity index 100%
rename from stock/templates/registered/fatlinkview.html
rename to fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
diff --git a/fleetactivitytracking/views.py b/fleetactivitytracking/views.py
index 9921fcbe..6bc3aba9 100644
--- a/fleetactivitytracking/views.py
+++ b/fleetactivitytracking/views.py
@@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
 from django.core.exceptions import ValidationError
 from django.utils import timezone
-
+from django.contrib import messages
 from eveonline.models import EveCharacter
 from eveonline.models import EveCorporationInfo
 from eveonline.managers import EveManager
@@ -71,7 +71,7 @@ def fatlink_view(request):
     else:
         context = {'user': user, 'fats': latest_fats}
 
-    return render(request, 'registered/fatlinkview.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkview.html', context=context)
 
 
 @login_required
@@ -113,7 +113,7 @@ def fatlink_statistics_view(request, year=datetime.date.today().year, month=date
         context = {'fatStats': fatStatsList, 'month': start_of_month.strftime("%B"), 'year': year,
                    'previous_month': start_of_previous_month}
 
-    return render(request, 'registered/fatlinkstatisticsview.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkstatisticsview.html', context=context)
 
 
 @login_required
@@ -141,7 +141,7 @@ def fatlink_personal_statistics_view(request, year=datetime.date.today().year, m
     else:
         context = {'user': user, 'monthlystats': monthlystats, 'year': year, 'previous_year': year - 1}
 
-    return render(request, 'registered/fatlinkpersonalstatisticsview.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkpersonalstatisticsview.html', context=context)
 
 
 @login_required
@@ -175,7 +175,7 @@ def fatlink_monthly_personal_statistics_view(request, year, month, char_id=None)
     context["created_fats"] = created_fats
     context["n_created_fats"] = len(created_fats)
 
-    return render(request, 'registered/fatlinkpersonalmonthlystatisticsview.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html', context=context)
 
 
 @login_required
@@ -212,21 +212,21 @@ def click_fatlink_view(request, token, hash, fatname):
                 try:
                     fat.full_clean()
                     fat.save()
-                    context = {'registered': True}
+                    messages.success(request, 'Fleet participation registered.')
                 except ValidationError as e:
-                    messages = []
+                    err_messages = []
                     for errorname, message in e.message_dict.items():
-                        messages.append(message[0].decode())
-                    context = {'errormessages': messages}
+                        err_messages.append(message[0].decode())
+                    messages.error(request, ' '.join(err_messages))
             else:
                 context = {'character_id': token.character_id,
                            'character_name': token.character_name}
-                return render(request, 'registered/characternotexisting.html', context=context)
+                return render(request, 'fleetactivitytracking/characternotexisting.html', context=context)
         else:
-            context = {'expired': True}
+            messages.error(request, 'FAT link has expired.')
     except (ObjectDoesNotExist, KeyError):
-        context = {}
-    return render(request, 'registered/clickfatlinkview.html', context=context)
+        messages.error(request, 'Invalid FAT link.')
+    return redirect('auth_fatlink_view')
 
 
 @login_required
@@ -255,7 +255,7 @@ def create_fatlink_view(request):
                     for errorname, message in e.message_dict.items():
                         messages.append(message[0].decode())
                     context = {'form': form, 'errormessages': messages}
-                    return render(request, 'registered/fatlinkformatter.html', context=context)
+                    return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context)
             else:
                 form = FatlinkForm()
                 context = {'form': form, 'badrequest': True}
@@ -268,7 +268,7 @@ def create_fatlink_view(request):
 
     context = {'form': form}
 
-    return render(request, 'registered/fatlinkformatter.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context)
 
 
 @login_required
@@ -296,4 +296,4 @@ def modify_fatlink_view(request, hash=""):
 
     context = {'fatlink': fatlink, 'registered_fats': registered_fats}
 
-    return render(request, 'registered/fatlinkmodify.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkmodify.html', context=context)
diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html
index 650d843a..8edaa580 100755
--- a/stock/templates/public/base.html
+++ b/stock/templates/public/base.html
@@ -12,7 +12,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>{% block title %}Empty title{% endblock title %}</title>
+    <title>{% block title %}Alliance Auth{% endblock title %}</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
diff --git a/stock/templates/registered/clickfatlinkview.html b/stock/templates/registered/clickfatlinkview.html
deleted file mode 100644
index a8007700..00000000
--- a/stock/templates/registered/clickfatlinkview.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends 'public/base.html' %}
-{% block title %}Fleet participation{% endblock %}
-{% block page_title %}Fleet Participation{% endblock %}
-{% block content %}
-<div class="col-lg-12">
-    {% if registered %}
-        <h1 class="page-header text-center">Fleet registered!</h1>
-    {% elif expired%}
-        <h1 class="page-header text-center">This link has expired.</h1>
-    {% elif errormessages%}
-        <h1 class="page-header text-center">Something horrible happened. Shoot your FC!</h1>
-    {% else %}
-        <h1 class="page-header text-center">Invalid link.</h1>
-    {% endif %}
-    <div class="col-lg-12 container" id="example">
-        {% for message in errormessages %}
-        <div class="alert alert-danger" role="alert">{{ message }}</div>
-        {% endfor %}
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">Fleet Stats</div>
-                    <div class="panel-body">
-                        <div class="col-lg-2 col-sm-2">
-                             <img class="ra-avatar img-responsive" src="https://image.eveonline.com/{% if IS_CORP %}Corporation/{{ CORPORATION_ID }}{% else %}Alliance/{{ ALLIANCE_ID }}{%  endif  %}_128.png">
-                        </div>
-                        <div class="col-lg-7 col-sm-2">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
-