diff --git a/app/views/country_selector.scala.html b/app/views/country_selector.scala.html
index 62386a8..2933d9a 100644
--- a/app/views/country_selector.scala.html
+++ b/app/views/country_selector.scala.html
@@ -1,5 +1,7 @@
 <div class="form-group horizontal-padding">
 	<label for="country">Country</label>
+	<button hidden class="btn btn-sm btn-default" id="get-all-countries">Get All Countries</button>
+	
 	<select id="country" class="form-control">
 		<option disabled selected value="-1">(not selected)</option>
 	</select>
diff --git a/conf/application.conf b/conf/application.conf
index bf50f44..3bc9dbc 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -84,7 +84,7 @@ play.evolutions.enabled=false
 play.http.context="/ls"
 
 # Application version. This is read by build.sbt
-app.version="1.2.1"
+app.version="2.0.2"
 
 # Set max post text (body) size
 #parsers.text.maxLength=10240K
diff --git a/public/javascripts/translator.js b/public/javascripts/translator.js
index 792f8b5..46bdf53 100644
--- a/public/javascripts/translator.js
+++ b/public/javascripts/translator.js
@@ -115,7 +115,7 @@
 					}
 					
 					for(i = 0; i < responseData.length; i++) {
-						displayResultRow(responseData[i].features[0].properties, maxCodesLength, codeTypes);
+						displayResultRow(responseData[i].features[0].properties, codeTypes);
 					}
 				},
 				error: function(xhr,status,error) {
@@ -131,28 +131,31 @@
 			return;
 		}
 		
-		function displayResultRow(properties, maxCodesLength, codeTypes) {
+		function displayResultRow(properties, codeTypes) {
 			var name = properties.name,
 				codes = properties.codes,
 				row = document.createElement("tr"),
 				th = document.createElement("th"),
 				td,
-				i;
+				i,
+				j;
 			
 			th.innerHTML = name;
 			th.headers = "results-names";
 			row.appendChild(th);
 			
-			for(i = 0; i < maxCodesLength; i++) {
+			for(i = 0; i < codeTypes.length; i++) {
 				td = document.createElement("td");
 				
-				if(codes[i]) {
-					while(codes[i].codeTypeName !== codeTypes[row.children.length - 1]) {
-						row.appendChild(td);
-						td = document.createElement("td");
+				for(j = 0; j < codes.length; j++) {
+					if(codes[j].codeTypeName === codeTypes[i]) {
+						if(td.innerHTML.length === 0) {
+							td.innerHTML = codes[j].code;
+						}
+						else {
+							td.innerHTML += ", " + codes[j].code;
+						}
 					}
-					
-					td.innerHTML = codes[i].code;
 				}
 				
 				td.headers = "results-codes";
diff --git a/public/stylesheets/create.css.x b/public/stylesheets/create.css.x
deleted file mode 100644
index de19454..0000000
--- a/public/stylesheets/create.css.x
+++ /dev/null
@@ -1,44 +0,0 @@
-@media only screen and (min-width: 768px) {
-	#creation-dialog {
-		width: 49.75%;
-		margin-right: 0.5%;
-	}
-
-	#parent-wizard {
-		width: 49.75%;
-	}
-}
-
-@media only screen and (max-width: 767px) {
-	#parent-wizard {
-		width: 100%;
-	}
-}
-
-#file-input {
-	background-color: #EEEEEE;
-	width: 100%;
-	border-radius: 0px 4px 4px 0px;
-	border-style: solid;
-	border-color: #D5D6D6;
-	border-width: 1px;
-}
-
-#description-label {
-	border-radius: 4px 4px 0px 0px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: #D5D6D6;
-	padding: 6px;
-	background-color: #EEEEEE;
-	color: #505050;
-}
-
-#description {
-	background-color: #FFFFFF;
-	width: 100%;
-	border-radius: 0px 4px 4px 0px;
-	border-style: solid;
-	border-color: #D5D6D6;
-	border-width: 1px;
-}
diff --git a/public/stylesheets/index.css.x b/public/stylesheets/index.css.x
deleted file mode 100644
index ee0918a..0000000
--- a/public/stylesheets/index.css.x
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-	index.css
-*/
-
-body {
-	margin: 0px;
-	padding: 0px;
-	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-em {
-	/*font-family: 'Times New Roman';*/
-	font-weight: normal;
-}
-
-.data-container {
-	color: rgb(0, 0, 0);
-	font-size: 16px;
-	clear: both;
-}
-
-.map {
-	width: 100%; //600px;
-	height: 450px;
-}
-
-#codes-toggle {
-	height: 20px;
-}
diff --git a/public/stylesheets/search.css.x b/public/stylesheets/search.css.x
deleted file mode 100644
index 90bec3e..0000000
--- a/public/stylesheets/search.css.x
+++ /dev/null
@@ -1,97 +0,0 @@
-#search-button {
-	vertical-align: inherit;
-}
-
-#leaflet-draw-marker a:hover{
-	cursor: default;
-	background-color: transparent;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: rgba(0, 0, 0, 0.1);
-}
-
-@media only screen and (min-width: 768px) {
-	#map-container {
-		width: 49.75%;
-		margin-right: 0.5%;
-	}
-
-	#results-output {
-		width: 49.75%;
-	}
-}
-@media only screen and (max-width: 767px) {
-	#map-container {
-		width: 100%;
-	}
-
-	#results-output {
-		width: 100%;
-		margin-bottom: 5px;
-	}
-}
-
-#result-count {
-	border-radius: 5px 5px 0px 0px;
-	background-color: #000000;
-	color: #00FFFF;
-}
-
-#result table {
-	display: table;
-	width: 100%;
-}
-
-#result table thead,
-#result table tbody {
-	width: 100%;
-	float: left;
-}
-
-#result table tbody {
-	border-radius: 5px;
-	overflow: auto;
-	max-height: 500px;
-}
-
-#result table tr {
-	width: 100%;
-	display: table;
-}
-
-#result tbody tr:nth-child(even) {
-	background-color: #F0FFFF;
-}
-
-#result tbody tr:nth-child(odd) {
-	background-color: #FFFFFF;
-}
-
-#result table thead tr {
-	background-color: #F0FFFF;
-	border-bottom-color: rgb(221, 221, 221);
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-}
-
-#result table tbody tr td,
-#result table thead tr th {
-	padding: 0px;
-	border-bottom: 0px;
-}
-
-#result table thead .location-col {
-	width: 38%;
-}
-
-#result table tbody .location-col {
-	width: 40%;
-}
-
-#result table .type-col {
-	width: 20%;
-}
-
-#result table .within-col {
-	width: 40%;
-}