diff --git a/panel/static/panel/js/panel.js b/panel/static/panel/js/panel.js
index 803812d..273646f 100644
--- a/panel/static/panel/js/panel.js
+++ b/panel/static/panel/js/panel.js
@@ -168,7 +168,7 @@ function set_job_status(project, uuid, job, value) {
   var div_job = $('#' + id);
 
   if (value) {
-    console.debug(job + ' found');
+    //console.debug(job + ' found');
     div_job.addClass(get_class_status("list-group-item-", value.result));
     div_job.html('<a href="' + value.job_url + value.buildnumber
       + '">' + job + '</a>');
@@ -208,7 +208,7 @@ function create_new_job_div(project, uuid, job) {
   div_job.attr('id', id + '-' + job).html(job);
   // put it on the proper place
   div_job.appendTo('#' + id + '-list');
-  console.debug('job ' + job + ' created for ' + project + ' uuid: ' + uuid);
+  //console.debug('job ' + job + ' created for ' + project + ' uuid: ' + uuid);
 }
 
 /**
@@ -281,15 +281,20 @@ function clean_uuids(release, project) {
   }
 }
 
-function create_new_uuid(release, project, uuid) {
+function create_new_uuid(release, project, values) {
+  var uuid = values.tag;
   if (uuid == null || $.release[project].uuids.has(uuid)) {
     return;
   }
+  // no need to add to remove later
+  if (!values.latest &&
+      $.release[project].uuids.size > $.release.max_uuids ) {
+    return;
+  }
 
   $.release[project].uuids.add(uuid);
   $.release[project][uuid] = { failed: false, jobs: new Set(),};
 
-  clean_uuids(release, project);
   create_new_uuid_panel(project, uuid);
   update_uuid_info(release, project, uuid);
   set_project_status(project, {created: true});
@@ -336,53 +341,34 @@ function update_uuid_info(release, project, uuid) {
   }
 }
 
-function get_latest_uuid_for_project(release, project) {
+function showLatestUUID(project, uuid) {
+  var div_project = $('#' + project);
+  $('.uuid-latest', project).addClass('hidden');
+  var div_uuid_name = $('#' + project + '-' + uuid);
+  $('.uuid-latest', div_uuid_name).removeClass('hidden');
+}
 
-  function showLatest(project, uuid) {
-    var div_project = $('#' + project);
-    $('.uuid-latest', project).addClass('hidden');
-    var div_uuid_name = $('#' + project + '-' + uuid);
-    $('.uuid-latest', div_uuid_name).removeClass('hidden');
-  }
+function get_uuids_for_project(release, project) {
 
   function successFunc(data, textStatus, jqXHR ) {
     $(data).each(function() {
-      if ($.release[project].last_uuid != this.tag) {
+      if (this.latest && $.release[project].last_uuid != this.tag) {
         $.release[project].last_uuid = this.tag;
         console.debug(project + ".latest_uuid:" + $.release[project].last_uuid);
-        showLatest(project, this.tag);
       }
-    });
-  }
-
-  function errorFunc(jqXHR, status, error) {
-    $('#' + project + '-error').html(error);
-  }
-
-  $.ajax({
-    url: '/release/' + release +'/' + project + '/latest/?format=json',
-    method: 'GET',
-    contentType: "application/json; charset=utf-8",
-    dataType: "json",
-    success: successFunc,
-    error: errorFunc
-  });
-}
-
-function get_uuids_for_project(release, project) {
-
-  function successFunc(data, textStatus, jqXHR ) {
-    $(data).each(function() {
-      if (!$.release[project].uuids.has(this.tag)) {
-        if(!$.release[project].removed_uuids.has(this.tag)) {
-          create_new_uuid(release, project, this.tag);
-          get_latest_uuid_for_project(release, project);
-        }
+      if (!$.release[project].uuids.has(this.tag) &&
+          !$.release[project].removed_uuids.has(this.tag))
+      {
+          create_new_uuid(release, project, this);
       }
-      else if (!$.release[project][this.tag].failed) {
+      else if (!$.release[project][this.tag].failed &&
+        !$.release[project].last_uuid == this.tag)
+      {
         update_uuid_info(release, project, this.tag);
       }
+      if (this.latest) showLatestUUID(project, this.tag);
     });
+    clean_uuids(release, project);
   }
 
   function errorFunc(jqXHR, status, error) {
diff --git a/panel/templates/panel/project.html b/panel/templates/panel/project.html
index 6aa2aa5..e761471 100644
--- a/panel/templates/panel/project.html
+++ b/panel/templates/panel/project.html
@@ -18,6 +18,7 @@
 <script type="text/javascript">
 $( document ).ready(function() {
   $.release.max_uuids = 15;
+  $.release.interval = 30000;
   $.release.timer = setInterval(function(){
     get_uuids_for_project('{{release}}', '{{ project }}');
   }, $.release.interval);
diff --git a/panel/templates/panel/release.html b/panel/templates/panel/release.html
index 050e58b..93ed7ea 100644
--- a/panel/templates/panel/release.html
+++ b/panel/templates/panel/release.html
@@ -19,6 +19,7 @@
 <script type="text/javascript">
 $( document ).ready(function() {
   $.release.max_uuids = 1;
+  $.release.interval = 30000;
   $.release.timer = setInterval(function(){
     update_info('{{release}}');
   }, $.release.interval);
diff --git a/repoapi/views.py b/repoapi/views.py
index ace01cc..913d19b 100644
--- a/repoapi/views.py
+++ b/repoapi/views.py
@@ -82,11 +82,16 @@ class ProjectUUIDList(APIView):
     def get(self, request, release, project, format=None):
         res = jbi.objects.release_project_uuids(
             release, project, flat=False)
+        latest = jbi.objects.latest_uuid(release, project)
         for r in res:
             r['url'] = reverse(
                 'uuidinfo-list',
                 args=[release, project, r['tag']],
                 request=request)
+            if r['tag'] == latest['tag']:
+                r['latest'] = True
+            else:
+                r['latest'] = False
         return Response(res)
 
 
@@ -94,13 +99,14 @@ class UUIDInfoList(APIView):
 
     def get(self, request, release, project, uuid, format=None):
         res = list()
+        jbis = serializers.JenkinsBuildInfoSerializer
         jobs = jbi.objects.jobs_by_uuid(release, project, uuid)
         for job in jobs:
-            serializer = serializers.JenkinsBuildInfoSerializer(job,
-                context={'request': request})
+            serializer = jbis(job, context={'request': request})
             res.append(serializer.data)
         return Response(res)
 
+
 class LatestUUID(APIView):
 
     def get(self, request, release, project, format=None):