diff --git a/cinema/lib/2.2/common.css b/cinema/lib/2.2/common.css
index b12697a..5602b54 100644
--- a/cinema/lib/2.2/common.css
+++ b/cinema/lib/2.2/common.css
@@ -9,9 +9,11 @@ div.container {
 
 body {
     background-color: #f9f9f9;
+    margin: 0;
 }
 
 header, footer {
+    font-weight: bold;
     padding-left:   1px;
     padding-right:  1px;
     padding-top:    10px;
@@ -22,8 +24,47 @@ header, footer {
     text-align: center;
 }
 
+footer {
+    padding-top:    2px;
+    padding-bottom: 2px;
+}
+
 #header h2 {
 	display: inline-block;
-	margin: initial;
 }
 
+#resultsArea {
+	float: left;
+	left: 0px;
+	right: 0px;
+	width: 100%;
+	padding: 10px;
+	background-color: white;
+}
+
+.imageArea {
+	float: left;
+	position: relative;
+	width: 75%;
+}
+
+.sliderArea {
+    font-style: normal;
+    font-weight: normal;
+    font-size: 1em;
+    font-family: "Geneva";
+    font-align: left;
+	float: left;
+	position: relative;
+	width: 20%;
+}
+
+.cinemaImage {
+	float: left;
+    border: 1px solid black;
+}
+
+.flex-container {
+    display: flex;
+    flex-wrap: wrap;
+}
diff --git a/cinema/lib/2.2/img/cinema_logo_filmreel_named_100px_white.png b/cinema/lib/2.2/img/cinema_logo_filmreel_named_100px_white.png
new file mode 100644
index 0000000..130da08
Binary files /dev/null and b/cinema/lib/2.2/img/cinema_logo_filmreel_named_100px_white.png differ
diff --git a/cinema/simple/2.2/images/empty.png b/cinema/lib/2.2/img/empty.png
similarity index 100%
rename from cinema/simple/2.2/images/empty.png
rename to cinema/lib/2.2/img/empty.png
diff --git a/cinema/lib/2.2/view.css b/cinema/lib/2.2/view.css
deleted file mode 100644
index 8080383..0000000
--- a/cinema/lib/2.2/view.css
+++ /dev/null
@@ -1,26 +0,0 @@
-#resultsArea {
-	float: left;
-	left: 0px;
-	right: 0px;
-	width: 100%;
-	padding: 10px;
-	background-color: white;
-}
-
-.imageArea {
-	float: left;
-	position: relative;
-	width: 75%;
-}
-
-.sliderArea {
-	float: left;
-	position: relative;
-	width: 20%;
-}
-
-.cinemaImage {
-	float: left;
-	position: relative;
-	padding: 2px;
-}
diff --git a/cinema/view/2.2/css/view.css b/cinema/view/2.2/css/view.css
deleted file mode 100644
index 8080383..0000000
--- a/cinema/view/2.2/css/view.css
+++ /dev/null
@@ -1,26 +0,0 @@
-#resultsArea {
-	float: left;
-	left: 0px;
-	right: 0px;
-	width: 100%;
-	padding: 10px;
-	background-color: white;
-}
-
-.imageArea {
-	float: left;
-	position: relative;
-	width: 75%;
-}
-
-.sliderArea {
-	float: left;
-	position: relative;
-	width: 20%;
-}
-
-.cinemaImage {
-	float: left;
-	position: relative;
-	padding: 2px;
-}
diff --git a/cinema/view/2.2/images/empty.png b/cinema/view/2.2/images/empty.png
deleted file mode 100644
index c0f7201..0000000
Binary files a/cinema/view/2.2/images/empty.png and /dev/null differ
diff --git a/cinema/view/2.2/main.js b/cinema/view/2.2/main.js
index 6a10336..82f6da2 100644
--- a/cinema/view/2.2/main.js
+++ b/cinema/view/2.2/main.js
@@ -1,4 +1,4 @@
-var emptyImage   = 'cinema/view/2.2/images/empty.png';
+var emptyImage   = 'cinema/lib/2.2/img/empty.png';
 var databaseList = 'cinema/view/2.2/databases.json';
 var databaseListType = 'json'
 var AssetName = "FILE"
@@ -186,7 +186,6 @@ function optionSelected()
     dataSets.forEach(function(item, index) {
         q.defer(d3.csv, item + "/data.csv");
     });
-
     q.awaitAll(function(error, results) {
         var values = {};
         results.forEach(function(item, index) {
@@ -222,7 +221,7 @@ function optionSelected()
 
     function updateResults() 
     {
-        // Called when sliders are moced
+        // Called when sliders are moved
         dataResults.forEach(function(result, index) {
             var imgSrcKey = getLookupKey(result.keys, query);
             if (imgSrcKey in result.lookup) {
@@ -296,6 +295,7 @@ function optionSelected()
                     .attr("id", "image_div_" + index.toString())
                     .style("width","" + imageSizeSlider.node().value + "%")
                     .style("text-align","center")
+                    .style("margin","5px")
                     .text(datasetNamestoLoad[index])
 
                 .append("img")
diff --git a/cinema_explorer.html b/cinema_explorer.html
index 550de16..3597c2e 100644
--- a/cinema_explorer.html
+++ b/cinema_explorer.html
@@ -84,7 +84,7 @@
 <body>
 	<div id="top">
 		<div id="header">
-			<h1>Cinema:Explorer</h1>
+			<h3>Cinema:Explorer</h3>
 			<!--Controls to select and load databases-->
 			<div id="databaseControls">
 				<span id="databaseLabel">Select Database:</span>
diff --git a/cinema_simple.html b/cinema_simple.html
index 609d780..6ffd3ce 100644
--- a/cinema_simple.html
+++ b/cinema_simple.html
@@ -4,193 +4,188 @@
 <head>
     <meta app="Cinema:Simple" version="2.2">
     <meta charset="utf-8">
-    <link rel='stylesheet' href='cinema/lib/2.2/view.css'>
     <link rel='stylesheet' href='cinema/lib/2.2/common.css'>
 
     <!-- Begin: Cinema Local File Install -->
     <!--
     <script src='cinema/lib/d3.v4.min.js'></script>
     -->
-    <!-- End:   Cinema Local File Install --->
-    <!-- Begin: Cinema External Access Install --->
+    <!-- End:   Cinema Local File Install -->
+    <!-- Begin: Cinema External Access Install -->
 	<script src="https://d3js.org/d3.v4.min.js"></script>
-    <!-- End:   Cinema External Access Install --->
+    <!-- End:   Cinema External Access Install -->
 </head>
 
 <body>
 <div class="container">
 <header>
-    <h2>Cinema:Simple</h2>
+    <!-- Begin: Cinema Viewer Title -->
+    Cinema:Simple
+    <!-- End:   Cinema Viewer Title -->
 </header>
 
 <div id="resultsArea">
-    <div class="imageArea" id="imageArea"></div>
+    <div class="imageArea flex-container" id="imageArea"></div>
     <div class="sliderArea">
+        <div id="imgSize">
+                <p>Image Size:</p>
+                <input type="range" min="1" max="100" id="imageSize" class="slidecontainer" step="1">
+        </div>
         <div id="sliderContainer" class="sliderContainer">
-            <div>
-                <div>Image Size</div>
-                <input type="range" min="1" max="100" id="imageSize" step="1">
-            </div>
         </div>
     </div>
     </div>
 </div>
 
-<footer>&nbsp</footer>
+<footer><img src="cinema/lib/2.2/img/cinema_logo_filmreel_named_100px_white.png" height=30px></img></footer>
 
 </div>
 
-   		<script>
-            var EMPTY_IMAGE_PATH = "cinema/simple/2.2/images/empty.png";
-			function onlyUnique(value, index, self) {
-			    return self.indexOf(value) === index;
-			}
-
-			function getLookupKey(keys, query) {
-				var key = "";
-				keys.forEach(function(item, index) {
-					key += query[item] + "_";
-				});
-
-				return key;
-			}
-
-            // CINEMA_DB_START: add code to manage databases to view 
-            var dataSets = ["data/sphere.cdb"];
-            // CINEMA_DB_END:   add code to manage databases to view 
-
-   			var dataResults = null;
-   			var dataValues = null;
-   			var query = {};
-   			var images = [];
-
-   			var q = d3.queue();
-   			dataSets.forEach(function(item, index) {
-				q.defer(d3.csv, item + "/data.csv");
-			});
-			q.awaitAll(function(error, results) {
-				var values = {};
-				results.forEach(function(item, index) {
-					var keys = Object.keys(item[0]).filter(function(d) {
-						return !isNaN(+item[0][d]);
-					});
-
-					var lookup = {};
-
-					item.forEach(function(result, index) {
-						keys.forEach(function(key, index) {
-							if (!(key in values)) {
-								values[key] = [];
-							}
-
-							values[key].push(result[key]);
-						});
-
-						lookup[getLookupKey(keys, result)] = result;
-					})
-
-					results[index] = {keys: keys, results: results[index], lookup: lookup};
-				});
-
-				var keys = Object.keys(values);
-				keys.forEach(function(key, index) {
-					values[key] = values[key].filter(onlyUnique);
-					values[key] = values[key].sort(function(a, b){return (+a)-(+b)});
-				});
-
-				doneLoading(results, values);
-			});
-
-			function updateResults() {
-				dataResults.forEach(function(result, index) {
-		   						var imgSrcKey = getLookupKey(result.keys, query);
-		   						if (imgSrcKey in result.lookup) {
-			   						var imgSrc = dataSets[index] + "/" +result.lookup[imgSrcKey]["FILE"];
-				   					images[index].img.attr("src", imgSrc);
-		   						}
-		   						else {
-				   					images[index].img.attr("src", EMPTY_IMAGE_PATH);
-		   						}
-		   					});
-			}
-
-			function doneLoading(results, values) {
-				var imageSizeSlider = d3.select("#imageSize")
-					.property("value", (100/dataSets.length)-1)
-					.on("input", function() {
-						images.forEach(function(item, index) {
-							item.img.style("width","" + imageSizeSlider.node().value + "%");
-							item.img.attr("height", null);
-						});
-					});
-
-				dataResults = results;
-				dataValues = values;
-
-				var keys = Object.keys(values);
-				keys.forEach(function(key, index) {
-					var sliderDiv = d3.select("#sliderContainer").append("div");
-					sliderDiv.append("div")
-						.html(key)
-                        .style("padding", "5px");
-					var slider = sliderDiv.append("div")
-			   			.append("input")
-			   				.attr("type","range")
-			   				.attr("min", "0")
-			   				.attr("max", values[key].length - 1)
-			   				.property("value", "0")
-			   				.style("float", "left");
-			   		var sliderText = sliderDiv.append("input")
-			   				.attr("type","text")
-			   				.attr("value", values[key][0])
-			   				.style("width", "40px")
-			   				.on("input", function() {
-			   					query[key] = this.value;
-			   					var index = values[key].indexOf(this.value);
-			   					slider.property("value", index);
-		   						updateResults();
-			   				});
-
-			   		slider.on("input", function() {
-			   				var val = values[key][+this.value];
-				   			sliderText.property("value", val);
-		   					query[key] = val;
-		   					updateResults();
-			   			});
-
-			   		query[key] = values[key][0];
-				});
-
-				dataResults.forEach(function(result, index) {
-					var imgSrcKey = getLookupKey(result.keys, query);
-
-					var img = d3.select("#imageArea").append("img")
-						.attr("class", "cinemaImage")
-						.attr("src", EMPTY_IMAGE_PATH) 
-						.style("width","" + imageSizeSlider.node().value + "%")
-						.on("load", function() {
-							if (this.src != EMPTY_IMAGE_PATH) {
-		   						images[index].height = this.height;
-							}
-		   				})
-						.on("error", function() {
-		   					this.src=EMPTY_IMAGE_PATH;
-		   					this.height = images[index].height;
-		   				});
-
-					images.push({img: img});
-
-		   			if (imgSrcKey in result.lookup) {
-			   			var imgSrc = dataSets[index] + "/" + result.lookup[imgSrcKey]["FILE"];
-				   		images[index].img.attr("src", imgSrc);
-		   			}
-		   			else {
-				   		images[index].img.attr("src", EMPTY_IMAGE_PATH);
-		   			}
-
-				});
-			}
-
-   		</script>
+<script> 
+var EMPTY_IMAGE_PATH = "cinema/lib/2.2/img/empty.png"; 
+function onlyUnique(value, index, self) { return self.indexOf(value) === index; } 
+function getLookupKey(keys, query) { var key = ""; keys.forEach(function(item, index) { key += query[item] + "_"; }); return key; }
+
+// CINEMA_DB_START: add code to manage databases to view 
+var dataSets = ["data/sphere.cdb"];
+// CINEMA_DB_END:   add code to manage databases to view 
+
+var dataResults = null;
+var dataValues = null;
+var query = {};
+var images = [];
+
+var q = d3.queue();
+dataSets.forEach(function(item, index) {
+    q.defer(d3.csv, item + "/data.csv");
+});
+
+q.awaitAll(function(error, results) {
+    var values = {};
+    results.forEach(function(item, index) {
+        var keys = Object.keys(item[0]).filter(function(d) {
+            return !isNaN(+item[0][d]);
+        });
+
+        var lookup = {};
+
+        item.forEach(function(result, index) {
+            keys.forEach(function(key, index) {
+                if (!(key in values)) {
+                    values[key] = [];
+                }
+
+                values[key].push(result[key]);
+            });
+
+            lookup[getLookupKey(keys, result)] = result;
+        })
+
+        results[index] = {keys: keys, results: results[index], lookup: lookup};
+    });
+
+    var keys = Object.keys(values);
+    keys.forEach(function(key, index) {
+        values[key] = values[key].filter(onlyUnique);
+        values[key] = values[key].sort(function(a, b){return (+a)-(+b)});
+    });
+
+    doneLoading(results, values);
+});
+
+function updateResults() 
+{
+    // Called when sliders are moved
+    dataResults.forEach(function(result, index) {
+        var imgSrcKey = getLookupKey(result.keys, query);
+        if (imgSrcKey in result.lookup) {
+            var imgSrc = dataSets[index] + "/" +result.lookup[imgSrcKey]["FILE"];
+            images[index].img.attr("src", imgSrc);
+        }
+        else {
+            images[index].img.attr("src", EMPTY_IMAGE_PATH);
+        }
+    });
+}
+
+function doneLoading(results, values) 
+{
+    var imageSizeSlider = d3.select("#imageSize")
+        .property("value", (100/dataSets.length)-1)
+        .on("input", function() {
+            images.forEach(function(item, index) {
+                item.img.style("width","" + imageSizeSlider.node().value + "%");
+                item.img.attr("height", null);
+            });
+        });
+
+    dataResults = results;
+    dataValues = values;
+
+    var keys = Object.keys(values);
+    keys.forEach(function(key, index) {
+        var sliderDiv = d3.select("#sliderContainer").append("div");
+        sliderDiv.append("div")
+            .html(key)
+            .style("padding", "5px");
+        var slider = sliderDiv.append("div")
+            .append("input")
+                .attr("type","range")
+                .attr("min", "0")
+                .attr("max", values[key].length - 1)
+                .property("value", "0")
+                .style("float", "left");
+        var sliderText = sliderDiv.append("input")
+                .attr("type","text")
+                .attr("value", values[key][0])
+                .style("width", "40px")
+                .on("input", function() {
+                    query[key] = this.value;
+                    var index = values[key].indexOf(this.value);
+                    slider.property("value", index);
+                    updateResults();
+                });
+
+        slider.on("input", function() {
+                var val = values[key][+this.value];
+                sliderText.property("value", val);
+                query[key] = val;
+                updateResults();
+            });
+
+        query[key] = values[key][0];
+    });
+
+    dataResults.forEach(function(result, index) {
+        var imgSrcKey = getLookupKey(result.keys, query);
+
+        var img = d3.select("#imageArea").append("img")
+            .attr("class", "cinemaImage")
+            .attr("src", EMPTY_IMAGE_PATH) 
+            .style("width","" + imageSizeSlider.node().value + "%")
+            .on("load", function() {
+                if (this.src != EMPTY_IMAGE_PATH) {
+                    images[index].height = this.height;
+                }
+            })
+            .on("error", function() {
+                this.src=EMPTY_IMAGE_PATH;
+                this.height = images[index].height;
+            });
+
+        images.push({img: img});
+
+        if (imgSrcKey in result.lookup) {
+            var imgSrc = dataSets[index] + "/" + result.lookup[imgSrcKey]["FILE"];
+            images[index].img.attr("src", imgSrc);
+        }
+        else {
+            images[index].img.attr("src", EMPTY_IMAGE_PATH);
+        }
+
+    });
+}
+
+</script>
    </body>
 </html>
diff --git a/cinema_view.html b/cinema_view.html
index 22515e4..321d9ff 100644
--- a/cinema_view.html
+++ b/cinema_view.html
@@ -2,22 +2,8 @@
 <html>
 
 <head>
-    <style>
-        p.slider_area {
-            font-style: normal;
-            font-weight: normal;
-            font-size: 1em;
-            font-family: "Geneva";
-        }
-
-        .flex-container {
-            display: flex;
-            flex-wrap: wrap;
-        }
-    </style>
     <meta app="Cinema:View" version="2.2">
     <meta charset="utf-8">
-    <link rel='stylesheet' href='cinema/lib/2.2/view.css'>
     <link rel='stylesheet' href='cinema/lib/2.2/common.css'>
     <link rel="stylesheet" href="cinema/view/2.2/css/select-css.css">
     <link rel="stylesheet" href="cinema/view/2.2/css/range-css.css">
@@ -26,43 +12,39 @@
     <!--
     <script src='cinema/lib/d3.v4.min.js'></script>
     -->
-    <!-- End:   Cinema Local File Install --->
-    <!-- Begin: Cinema External Access Install --->
+    <!-- End:   Cinema Local File Install -->
+    <!-- Begin: Cinema External Access Install -->
 	<script src="https://d3js.org/d3.v4.min.js"></script>
-    <!-- End:   Cinema External Access Install --->
+    <!-- End:   Cinema External Access Install -->
 </head>
 
 <body>
 <div class="container">
 <header>
-    <h1>Cinema:View</h1>
+    <!-- Begin: Cinema Viewer Title -->
+    Cinema:View
+    <!-- End:   Cinema Viewer Title -->
 </header>
 
 <div id="resultsArea">
-    
     <div class="imageArea flex-container" id="imageArea"></div>
-    
     <div class="sliderArea">
         <div id="delectDB">
-            <p class="slider_area"> Select Dataset:
+            <p> Select Dataset:
                 <select id="dbList" class="select-css" onchange="optionSelected();">
                 </select>
             </p>
         </div>
         <div id="imgSize">
-            <p class="slider_area">
-                <div>Image Size:</div>
+                <p>Image Size:</p>
                 <input type="range" min="1" max="100" id="imageSize" class="slidecontainer" step="1">
-            </p>
         </div>
-        <p class="slider_area">
-            <div id="sliderContainer" class="sliderContainer"> </div>
-        </p>
+        <div id="sliderContainer" class="sliderContainer">
+        </div>
     </div>
-    
 </div>
 
-<footer>&nbsp</footer>
+<footer><img src="cinema/lib/2.2/img/cinema_logo_filmreel_named_100px_white.png" height=30px></img></footer>
 
 </div>
 <script src="cinema/lib/2.2/databases.js"></script>
diff --git a/citation.md b/doc/citation.md
similarity index 100%
rename from citation.md
rename to doc/citation.md
diff --git a/testing/explorer/browser.py b/testing/explorer/browser.py
index b955217..b665035 100644
--- a/testing/explorer/browser.py
+++ b/testing/explorer/browser.py
@@ -3,7 +3,7 @@
 
 # open several instances of URL to test
 webbrowser.open_new("http://127.0.0.1:8000/cinema_explorer.html")
-webbrowser.open_new_tab("http://127.0.0.1:8000/cinema_explorer.html?databases=testing/small.json")
+webbrowser.open_new_tab("http://127.0.0.1:8000/cinema_explorer.html?databases=testing/explorer/small.json")
 webbrowser.open_new_tab("http://127.0.0.1:8000/cinema_explorer.html?databases=data/sphere.cdb")
 webbrowser.open_new_tab("http://127.0.0.1:8000/cinema_explorer.html?databases=data/sphere_multi-image.cdb,data/sphere.cdb")
 
diff --git a/testing/explorer/small.json b/testing/explorer/small.json
index c008774..8fd711f 100644
--- a/testing/explorer/small.json
+++ b/testing/explorer/small.json
@@ -1,14 +1,14 @@
 [
 	{
-		"name" : "sphere",
+		"name" : "testing explorer: sphere",
 		"directory" : "data/sphere.cdb"
 	},
 	{
-		"name" : "Sphere Multi-Image",
+		"name" : "testing explorer: Sphere Multi-Image",
 		"directory" : "data/sphere_multi-image.cdb"
 	},
 	{
-		"name" : "Many File Types",
+		"name" : "testing explorer: Many File Types",
 		"directory" : "data/file_types.cdb"
 	}
 ]
diff --git a/testing/view/browser.py b/testing/view/browser.py
new file mode 100644
index 0000000..017e7f4
--- /dev/null
+++ b/testing/view/browser.py
@@ -0,0 +1,9 @@
+import webbrowser
+
+
+# open several instances of URL to test
+webbrowser.open_new("http://127.0.0.1:8000/cinema_view.html")
+webbrowser.open_new_tab("http://127.0.0.1:8000/cinema_view.html?databases=testing/view/small.json")
+webbrowser.open_new_tab("http://127.0.0.1:8000/cinema_view.html?databases=data/sphere.cdb")
+webbrowser.open_new_tab("http://127.0.0.1:8000/cinema_view.html?databases=data/sphere_multi-image.cdb,data/sphere.cdb")
+
diff --git a/testing/view/server.py b/testing/view/server.py
new file mode 100644
index 0000000..869b93c
--- /dev/null
+++ b/testing/view/server.py
@@ -0,0 +1,10 @@
+import http.server
+import socketserver
+
+PORT = 8000
+
+handler = http.server.SimpleHTTPRequestHandler
+
+with socketserver.TCPServer(("", PORT), handler) as httpd:
+    print("Server started at localhost:" + str(PORT))
+    httpd.serve_forever()
diff --git a/testing/view/small.json b/testing/view/small.json
index ad48110..9bbf681 100644
--- a/testing/view/small.json
+++ b/testing/view/small.json
@@ -1,18 +1,26 @@
 [
 	{
-		"database_name-comment" : "The name of the dataset. It will appear in the dropdown.",
-		"database_name": "sphere test",
-
-		"databases-comment" : "JSON array containing list of datasets to view",
+		"database_name": "testing view: sphere",
 		"datasets": 
 		[
 			{
-				"name-comment": "Each dataset must have a name that will appear at the top of the image",
-				"name": "sphere",
-
-				"location-comment" : "Location of the cinema database relative to cinema root or absolute paths",
+				"name": "testing view: sphere",
 				"location": "data/sphere.cdb"
 			}
 		]
+	},
+	{
+		"database_name": "testing view: sedov",
+		"datasets": 
+		[
+			{
+				"name": "testing view: sedov1",
+				"location": "data/sedov1.cdb"
+			},
+			{
+				"name": "testing view: sedov2",
+				"location": "data/sedov2.cdb"
+			}
+		]
 	}
 ]
diff --git a/testplan_explorer.html b/testplan_explorer.html
index e828c96..2366ee8 100644
--- a/testplan_explorer.html
+++ b/testplan_explorer.html
@@ -3,25 +3,62 @@ <h1>Cinema Explorer URL Test Plan</h1>
 The following links test attribute passing over URL:
 <p></p>
 
+<h3>No server</h3>
 <table>
 <tr>
     <td>Normal behavior</td>
-    <td><a href="cinema_explorer.html">cinema_explorer.html</a></td>
+    <td><a href="cinema_explorer.html">
+                 cinema_explorer.html</a></td>
 </tr>
 <tr>
     <td>Passing a database.json file</td>
-    <td><a href="cinema_explorer.html?databases=testing/explorer/small.json">cinema_explorer.html?databases=testing/explorer/small.json</a></td>
+    <td><a href="cinema_explorer.html?databases=testing/explorer/small.json">
+                 cinema_explorer.html?databases=testing/explorer/small.json</a></td>
 </tr>
 <tr>
     <td>Passing a single database</td>
-    <td><a href="cinema_explorer.html?databases=data/sphere_multi-image.cdb">cinema_explorer.html?databases=data/sphere_multi-image.cdb</a></td>
+    <td><a href="cinema_explorer.html?databases=data/sphere_multi-image.cdb">
+                 cinema_explorer.html?databases=data/sphere_multi-image.cdb</a></td>
 </tr>
 <tr>
     <td>Passing multiple databases</td>
-    <td><a href="cinema_explorer.html?databases=data/sphere_multi-image.cdb,data/sphere.cdb">cinema_explorer.html?databases=data/sphere_multi-image.cdb,data/sphere.cdb</a></td>
+    <td><a href="cinema_explorer.html?databases=data/sphere_multi-image.cdb,data/sphere.cdb">
+                 cinema_explorer.html?databases=data/sphere_multi-image.cdb,data/sphere.cdb</a></td>
 </tr>
 <tr>
     <td>Passing ParaView database</td>
-    <td><a href="cinema_explorer.html?databases=data/test_paraview.cdb">cinema_explorer.html?databases=data/test_paraview.cdb</a></td>
+    <td><a href="cinema_explorer.html?databases=data/test_paraview.cdb">
+                 cinema_explorer.html?databases=data/test_paraview.cdb</a></td>
+</tr>
+</table>
+
+<h3>With server</h3>
+Run server at <code>testing/explorer/server.py</code>
+<p></p>
+<table>
+<tr>
+    <td>Normal behavior</td>
+    <td><a href="http://127.0.0.1:8000/cinema_explorer.html">
+                 cinema_explorer.html</a></td>
+</tr>
+<tr>
+    <td>Passing a database.json file</td>
+    <td><a href="http://127.0.0.1:8000/cinema_explorer.html?databases=testing/explorer/small.json">
+                 cinema_explorer.html?databases=testing/explorer/small.json</a></td>
+</tr>
+<tr>
+    <td>Passing a single database</td>
+    <td><a href="http://127.0.0.1:8000/cinema_explorer.html?databases=data/sphere_multi-image.cdb">
+                 cinema_explorer.html?databases=data/sphere_multi-image.cdb</a></td>
+</tr>
+<tr>
+    <td>Passing multiple databases</td>
+    <td><a href="http://127.0.0.1:8000/cinema_explorer.html?databases=data/sphere_multi-image.cdb,data/sphere.cdb">
+                 cinema_explorer.html?databases=data/sphere_multi-image.cdb,data/sphere.cdb</a></td>
+</tr>
+<tr>
+    <td>Passing ParaView database</td>
+    <td><a href="http://127.0.0.1:8000/cinema_explorer.html?databases=data/test_paraview.cdb">
+                 cinema_explorer.html?databases=data/test_paraview.cdb</a></td>
 </tr>
 </table>
diff --git a/testplan_view.html b/testplan_view.html
index d5e5580..851f8f0 100644
--- a/testplan_view.html
+++ b/testplan_view.html
@@ -3,6 +3,7 @@ <h1>Cinema View URL Test Plan</h1>
 The following links test attribute passing over URL, within the browser:
 <p></p>
 
+<h3>No server</h3>
 <table>
 <tr>
     <td>Normal behavior</td>
@@ -30,3 +31,34 @@ <h1>Cinema View URL Test Plan</h1>
                  cinema_view.html?databases=data/test_paraview.cdb&assetname=FILE_png</a></td>
 </tr>
 </table>
+
+<h3>With server</h3>
+Run server at <code>testing/view/server.py</code>
+<p></p>
+<table>
+<tr>
+    <td>Normal behavior</td>
+    <td><a href="http://127.0.0.1:8000/cinema_view.html">
+                 cinema_view.html</a></td>
+</tr>
+<tr>
+    <td>Passing a database.json file</td>
+    <td><a href="http://127.0.0.1:8000/cinema_view.html?databases=testing/view/small.json">
+                 cinema_view.html?databases=testing/view/small.json</a></td>
+</tr>
+<tr>
+    <td>Single database</td>
+    <td><a href="http://127.0.0.1:8000/cinema_view.html?databases=data/sedov3.cdb">
+                 cinema_view.html?databases=data/sedov3.cdb</a></td>
+</tr>
+<tr>
+    <td>Multiple databases</td>
+    <td><a href="http://127.0.0.1:8000/cinema_view.html?databases=data/sedov3.cdb,data/sedov2.cdb,data/sedov1.cdb">
+                 cinema_view.html?databases=data/sedov3.cdb,data/sedov2.cdb,data/sedov1.cdb</a></td>
+</tr>
+<tr>
+    <td>Loading ParaView database (assetname attribute)</td>
+    <td><a href="http://127.0.0.1:8000/cinema_view.html?databases=data/test_paraview.cdb&assetname=FILE_png">
+                 cinema_view.html?databases=data/test_paraview.cdb&assetname=FILE_png</a></td>
+</tr>
+</table>