diff --git a/video_metadata/templates/base.html b/video_metadata/templates/base.html
index 364fa3b..7fa93b1 100644
--- a/video_metadata/templates/base.html
+++ b/video_metadata/templates/base.html
@@ -1,22 +1,32 @@
 <!doctype html>
-<title>{% block title %}{% endblock %} - video_metadata</title>
-<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
-<nav>
-<h1>video_metadata</h1>
-	<ul>
-		<li><a href="{{ url_for('index') }}">Home</a>
-		<li><a href="{{ url_for('file_listing.index') }}">File Listing</a>
-		<li><a href="{{ url_for('tmdb.query_movie') }}">Query</a>
-	</ul>
-</nav>
-<section class="content">
-	<header>
-		{% block header %}{% endblock %}
-	</header>
+<html>
+<head>
+	<title>{% block title %}{% endblock %} - video_metadata</title>
+	<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
+</head>
+<body>
+	<nav>
+		<h1>video_metadata</h1>
+		<ul>
+			<li><a href="{{ url_for('index') }}">Home</a>
+			<li><a href="{{ url_for('file_listing.index') }}">File Listing</a>
+			<li><a href="{{ url_for('tmdb.query_movie') }}">Query</a>
+		</ul>
+	</nav>
+	<section class="content">
+		<header>
+			{% block header %}{% endblock %}
+		</header>
 
-	{% for message in get_flashed_messages() %}
-		<div class="flash">{{ message }}</div>
-	{% endfor %}
+		{% for message in get_flashed_messages() %}
+			<div class="flash">{{ message }}</div>
+		{% endfor %}
 
-	{% block content %}{% endblock %}
-</section>
+		{% block content %}{% endblock %}
+	</section>
+	<section class="debug">
+		<h3>Debug Info</h3>
+		<pre>{{ debug_str }}</pre>
+	</section>
+</body>
+</html>
diff --git a/video_metadata/templates/file_listing/index.html b/video_metadata/templates/file_listing/index.html
index 1128a9f..75dec7e 100644
--- a/video_metadata/templates/file_listing/index.html
+++ b/video_metadata/templates/file_listing/index.html
@@ -20,9 +20,4 @@
 		</li>
 	{% endfor %}
 	</ul>
-
-	<div class="debug">
-		<h3>Debug Info</h3>
-		<pre>{{ debug_str }}</pre>
-	</div>
 {% endblock %}
diff --git a/video_metadata/templates/tmdb/create_mapping.html.jinja b/video_metadata/templates/tmdb/create_mapping.html.jinja
index e723590..d40b77b 100644
--- a/video_metadata/templates/tmdb/create_mapping.html.jinja
+++ b/video_metadata/templates/tmdb/create_mapping.html.jinja
@@ -8,8 +8,4 @@
 	{% if success %}
 		<p>Successfully added file mapping for {{ rel_path }}</p>
 	{% endif %}
-
-	<div class="debug">
-		<pre>movie_id: {{ movie_id }}, rel_path: {{ rel_path }}</pre>
-	</div>
 {% endblock %}
diff --git a/video_metadata/templates/tmdb/list_movie_test.html.jinja b/video_metadata/templates/tmdb/list_movie_test.html.jinja
index 566d7cb..c7df2ef 100644
--- a/video_metadata/templates/tmdb/list_movie_test.html.jinja
+++ b/video_metadata/templates/tmdb/list_movie_test.html.jinja
@@ -19,8 +19,4 @@
 			</div>
 		{% endfor %}
 	</div>
-
-	<div class="debug">
-		<pre></pre>
-	</div>
 {% endblock %}
diff --git a/video_metadata/templates/tmdb/query.html b/video_metadata/templates/tmdb/query.html
index c5f0210..3929eaf 100644
--- a/video_metadata/templates/tmdb/query.html
+++ b/video_metadata/templates/tmdb/query.html
@@ -31,9 +31,4 @@
 		{% endfor %}
 	</div>
 	{% endif %}
-
-	<div class="debug">
-		<h3>Debug Info</h3>
-		<pre>{{ debug_str }}</pre>
-	</div>
 {% endblock %}
diff --git a/video_metadata/views/tmdb.py b/video_metadata/views/tmdb.py
index 076200f..b6295c1 100644
--- a/video_metadata/views/tmdb.py
+++ b/video_metadata/views/tmdb.py
@@ -186,6 +186,7 @@ def create_mapping():
     return render_template('tmdb/create_mapping.html.jinja',
             movie_id = movie_id,
             rel_path = rel_path,
+            debug_str = util.dumpObject({'movie_id': movie_id, 'rel_path': rel_path}),
             success = (len(errors) == 0)
         )
 
