diff --git a/photo21/settings.py b/photo21/settings.py
index 01ab079..2d8b229 100644
--- a/photo21/settings.py
+++ b/photo21/settings.py
@@ -41,6 +41,7 @@ INSTALLED_APPS = [
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'photologue_custom',
     'photologue',
     'sortedm2m',
 ]
diff --git a/photologue_custom/__init__.py b/photologue_custom/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/photologue_custom/admin.py b/photologue_custom/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/photologue_custom/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/photologue_custom/apps.py b/photologue_custom/apps.py
new file mode 100644
index 0000000..b08e032
--- /dev/null
+++ b/photologue_custom/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class PhotologueCustomConfig(AppConfig):
+    name = 'photologue_custom'
diff --git a/photologue_custom/migrations/__init__.py b/photologue_custom/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/photologue_custom/models.py b/photologue_custom/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/photologue_custom/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/photo21/templates/photologue/gallery_archive.html b/photologue_custom/templates/photologue/gallery_archive.html
similarity index 100%
rename from photo21/templates/photologue/gallery_archive.html
rename to photologue_custom/templates/photologue/gallery_archive.html
diff --git a/photo21/templates/photologue/gallery_archive_year.html b/photologue_custom/templates/photologue/gallery_archive_year.html
similarity index 100%
rename from photo21/templates/photologue/gallery_archive_year.html
rename to photologue_custom/templates/photologue/gallery_archive_year.html
diff --git a/photo21/templates/photologue/gallery_detail.html b/photologue_custom/templates/photologue/gallery_detail.html
similarity index 55%
rename from photo21/templates/photologue/gallery_detail.html
rename to photologue_custom/templates/photologue/gallery_detail.html
index ab7108a..95d1e1d 100644
--- a/photo21/templates/photologue/gallery_detail.html
+++ b/photologue_custom/templates/photologue/gallery_detail.html
@@ -21,18 +21,15 @@
 {% endblock %}
 
 {% block content %}
-<div class="row">
-    <div class="col-lg-12">
-        <h1>{{ gallery.title }}</h1>
-        <p class="text-muted small">{% trans "Published" %} {{ gallery.date_added }}</p>
-        {% if gallery.description %}<p>{{ gallery.description|safe }}</p>{% endif %}
-        <div class="gallery-list" id="lightgallery">
-            {% for photo in gallery.public %}
-            <a href="{{ photo.get_absolute_url }}" data-src="{{ photo.get_display_url }}" data-download-url="{{ photo.image.url }}">
-                <img src="{{ photo.get_thumbnail_url }}" class="img-thumbnail" alt="{{ photo.title }}">
-            </a>
-            {% endfor %}
-        </div>
-    </div>
+<h1>{{ gallery.title }}</h1>
+<p class="text-muted small">{% trans "Published" %} {{ gallery.date_added }}</p>
+{% if gallery.description %}<p>{{ gallery.description|safe }}</p>{% endif %}
+<div class="gallery-list mb-3" id="lightgallery">
+    {% for photo in gallery.public %}
+    <a href="{{ photo.get_absolute_url }}" data-src="{{ photo.get_display_url }}" data-download-url="{{ photo.image.url }}">
+        <img src="{{ photo.get_thumbnail_url }}" class="img-thumbnail" alt="{{ photo.title }}">
+    </a>
+    {% endfor %}
 </div>
+<a href="#" class="btn btn-secondary">{% trans 'Download all gallery' %}</a>
 {% endblock %}
diff --git a/photo21/templates/photologue/includes/gallery_sample.html b/photologue_custom/templates/photologue/includes/gallery_sample.html
similarity index 100%
rename from photo21/templates/photologue/includes/gallery_sample.html
rename to photologue_custom/templates/photologue/includes/gallery_sample.html
diff --git a/photologue_custom/templates/photologue/photo_detail.html b/photologue_custom/templates/photologue/photo_detail.html
new file mode 100644
index 0000000..af7ebe8
--- /dev/null
+++ b/photologue_custom/templates/photologue/photo_detail.html
@@ -0,0 +1,31 @@
+{% extends "photologue/root.html" %}
+{% load photologue_tags i18n %}
+
+{% block title %}{{ object.title }}{% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col-lg-12">
+        <h1>{{ object.title }}</h1>
+        <p class="text-muted small">{% trans "Published" %} {{ object.date_added }}</p>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-8">
+        {% if object.caption %}<p>{{ object.caption|safe }}</p>{% endif %}
+        <a href="{{ object.image.url }}">
+            <img src="{{ object.get_display_url }}" class="img-thumbnail" alt="{{ object.title }}">
+        </a>
+    </div>
+    <div class="col-md-4">
+        {% if object.public_galleries %}
+        <p>{% trans "This photo is found in the following galleries" %}:</p>
+        <ul>
+            {% for gallery in object.public_galleries %}
+                <li><a href="{{ gallery.get_absolute_url }}">{{ gallery.title }}</a></li>
+            {% endfor %}
+        </ul>    
+        {% endif %}
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/photologue_custom/tests.py b/photologue_custom/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/photologue_custom/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/photologue_custom/views.py b/photologue_custom/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/photologue_custom/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.