diff --git a/js/util.js b/js/util.js
index 2e8e435..e62fb32 100644
--- a/js/util.js
+++ b/js/util.js
@@ -150,12 +150,16 @@ function getImageFromWikipedia(data,pageName,imagesize,callback){
 
 function renderRaceInfoBox(race) {
   var raceInfo = race.raceInfo;
+  var circuit = preprocessor.getResults().circuits[raceInfo.circuitId];
   //console.log(raceInfo);
   var content = "";
 
   content = "<h1 data-toggle=\"tooltip\" data-placement=\"top\" title=\"#"+raceInfo.raceId+"\">"+raceInfo.name+"</h1>";
-  content += "<h5>"+raceInfo.date.toLocaleDateString("de-DE")+"</h5>";
-  content += "<a class=\"btn btn-primary\" target=\"_blank\" href=\""+raceInfo.url+"\" role=\"button\">See on Wikipedia</a>";
-
+  content += "<h5>"+circuit.name+" ("+circuit.location+", "+circuit.country+")</h5>";
+  content += "<h6>"+raceInfo.date.toLocaleDateString("de-DE")+"</h6>"
+  content += "<div class=\"text-right\">";
+  content += "<a class=\"btn btn-primary\" target=\"_blank\" href=\""+raceInfo.url+"\" role=\"button\">See Race on Wikipedia</a> ";
+  content += "<a class=\"btn btn-primary\" target=\"_blank\" href=\""+circuit.url+"\" role=\"button\">See Circuit on Wikipedia</a>";
+  content += "</div>";
   return content;
 }