diff --git a/projects/index.html b/projects/index.html
index 0e383a9..5da3483 100644
--- a/projects/index.html
+++ b/projects/index.html
@@ -86,10 +86,7 @@ <h2><img class='img-rounded thumbnail hidden' height='50' width='50' alt="thumbn
 						<p class="col-sm-12 language"><strong>Language(s)</strong><br/> <span></span></p>
 					</div>
 					<p class="license hidden"><strong>License</strong><br/> <span></span></p>
-					<p class="governmentPartner hidden"><strong>Government Partner</strong><br/> <span></span></p>
-					<p class="communityPartner hidden"><strong>Community Partner</strong><br/> <span></span></p>
-					<p class="politicalEntity hidden"><strong>Relevant to</strong><br/> <span></span></p>
-					<p class="accessibility hidden"><strong>WCAG2AAA Accessible:</strong> <span></span></p>
+					<p class="partners hidden"><strong>Partners</strong><br/> <span></span></p>
 					<p class="contact">
 						<a class='btn btn-info btn-sm email hidden' role='button' name="email" title="Email"><i class='fa fa-envelope fa-lg'></i></a>
 						<a class='btn btn-info btn-sm twitter hidden' role='button' name="twitter" title="Tweet Us"><i class='fa fa-twitter fa-lg'></i></a>
@@ -112,10 +109,6 @@ <h4><strong>Activity</strong></h4>
 				<div class="col-sm-3">
 					<h4><strong>Get Involved</strong></h4>
 					<p class="issues"><a class='btn btn-info' role='button'></a></p>
-					<div class="needs hidden">
-						<strong>Needs</strong>
-						<div><ul> </ul></div>
-					</div>
 					<div class="ci-reports">
 						<strong>CI Reports</strong>
 						<div></div>
@@ -202,7 +195,11 @@ <h4><strong>Get Involved</strong></h4>
 		if (info.license) {
 			project.find(".license").removeClass("hidden")
 			.find("span").html(info.license.name);
-		} else {
+		} else if (info.civic_json && info.civic_json.license) {
+      // Put civic.json license second since GitHub's identifier may be more reliable
+      project.find(".license").removeClass("hidden")
+			.find("span").html(info.civic_json.license);
+    } else {
 			project.find(".license").removeClass("hidden")
 			.find("span").html("None");
 		}
@@ -241,8 +238,6 @@ <h4><strong>Get Involved</strong></h4>
 		project.find(".github-repo").removeClass('hidden')
 		.find('a.repo-link').attr('href', repo_link).text("Github repository >");
 
-		project.find('.description').text(info.description);
-
 		if (info.homepage){
 			project.find(".homepage").removeClass('hidden')
 			.find('a').attr('href', info.homepage).text(info.homepage);
@@ -271,6 +266,12 @@ <h4><strong>Get Involved</strong></h4>
 		// civic.json related data
 
 		if (info.civic_json) {
+      if (info.civic_json.description){
+        project.find('.description').text(info.civic_json.description);
+      } else {
+        project.find('.description').text(info.description);
+      }
+
 			if (info.civic_json.thumbnailUrl){
 				project.find(".thumbnail").removeClass("hidden")
 				.attr("src", info.civic_json.thumbnailUrl);
@@ -286,58 +287,24 @@ <h4><strong>Get Involved</strong></h4>
 				.attr('href', 'http://twitter.com/' + info.civic_json.contact.twitter.slice(1));
 			}
 
-			if (info.civic_json.communityPartner){
-				var compartner = "";
-				$.each(info.civic_json.communityPartner, function(k,v){
-					compartner += "<a href='"+v+"'>"+k+"</a>";
-				});
-				if (compartner.length > 0){
-					project.find(".communityPartner").removeClass('hidden').
-					find("span").html(compartner);
-				}
-			}
-
-			if (info.civic_json.governmentPartner){
-				var govpartner = "";
-				$.each(info.civic_json.governmentPartner, function(k,v){
-					govpartner += "<a href='"+v+"'>"+k+"</a>";
-				});
-				if (govpartner.length > 0){
-					project.find(".governmentPartner").removeClass('hidden').
-					find("span").html(govpartner);
-				}
-			}
-
-			if (info.civic_json.politicalEntity){
-				var polentity = "";
-				$.each(info.civic_json.politicalEntity, function(k,v){
-					polentity += "<a href='"+v+"'>"+k+"</a>";
-				});
-				if (polentity.length > 0){
-					project.find(".politicalEntity").removeClass('hidden').
-					find("span").html(polentity);
-				}
-			}
-
-			if (info.civic_json.needs){
-				if (info.civic_json.needs.length > 0) {
-					project.find('.needs').removeClass("hidden");
-					$.each(info.civic_json.needs, function(k,v){
-						project.find('.needs div').append(
-							$("<li class='need'></li>").text(v.need)
-							);
-					});
-				}
-			}
+      if (info.civic_json.partners){
+        $.each(info.civic_json.partners, function(k,v){
+          partners += "<a href='"+v+"'>"+k+"</a>";
+        })
+        if (partners.length > 0){
+          project.find(".partners").removeClass('hidden').
+					find("span").html(partners);
+        }
+      }
 
 			if (info.civic_json.status){
 				project.find('.status').removeClass("hidden").find("span").text(info.civic_json.status);
 			}
 
-			if (info.civic_json.categories){
-				$.each(info.civic_json.categories, function(k,v){
-					project.find('.categories').append($("<p><button class='btn btn-sm btn-warning category'></button></p>").find('button').text(v.category));
-					c = classify(v.category);
+			if (info.civic_json.tags){
+				$.each(info.civic_json.tags, function(k,v){
+					project.find('.tags').append($("<p><button class='btn btn-sm btn-warning category'></button></p>").find('button').text(v.tag));
+					c = classify(v.tag);
 					project.addClass("category-"+c);
 					if ($.inArray(c,cat)==-1){
 						cat.push(c);
@@ -450,7 +417,7 @@ <h4><strong>Get Involved</strong></h4>
 	$(window).trigger('resize');
 
 	// Hide CI reports that 404'd
-	$("img").error(function () { 
+	$("img").error(function () {
 	    $(this).hide();
 	});