diff --git a/webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/plugin/challenge5/Votes.java b/webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/plugin/challenge5/Votes.java
index cb1aac074..497d1e456 100644
--- a/webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/plugin/challenge5/Votes.java
+++ b/webgoat-lessons/challenge/src/main/java/org/owasp/webgoat/plugin/challenge5/Votes.java
@@ -7,7 +7,6 @@ import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwt;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
@@ -34,36 +33,50 @@ public class Votes {
 
     private static String validUsers = "TomJerrySylvester";
 
-    @AllArgsConstructor
     @Getter
-    private class Voting {
+    private static class Voting {
         @JsonView(Views.GuestView.class)
-        private String title;
+        private final String title;
         @JsonView(Views.GuestView.class)
-        private String information;
+        private final String information;
         @JsonView(Views.GuestView.class)
-        private String imageSmall;
+        private final String imageSmall;
         @JsonView(Views.GuestView.class)
-        private String imageBig;
+        private final String imageBig;
         @JsonView(Views.UserView.class)
-        private int numberOfVotes;
+        private final int numberOfVotes;
         @JsonView(Views.AdminView.class)
         private String flag = FLAGS.get(5);
         @JsonView(Views.UserView.class)
-        private boolean votingAllowed;
+        private boolean votingAllowed = true;
+        @JsonView(Views.UserView.class)
+        private String average = "0.0";
+
+
+        public Voting(String title, String information, String imageSmall, String imageBig, int numberOfVotes) {
+            this.title = title;
+            this.information = information;
+            this.imageSmall = imageSmall;
+            this.imageBig = imageBig;
+            this.numberOfVotes = numberOfVotes;
+            this.average = String.valueOf((double)numberOfVotes / (double)totalVotes);
+        }
     }
 
-    private int totalVotes = 38929;
+    private static int totalVotes = 38929;
     private List votes = Lists.newArrayList(
             new Voting("Admin lost password",
                     "In this challenge you will need to help the admin and find the password in order to login",
-                    "challenge1-small.png", "challenge1.png", 14242, FLAGS.get(5), true),
+                    "challenge1-small.png", "challenge1.png", 14242),
             new Voting("Vote for your favourite",
                     "In this challenge ...",
-                    "challenge5-small.png", "challenge5.png", 12345, FLAGS.get(5), true),
+                    "challenge5-small.png", "challenge5.png", 12345),
             new Voting("Get is for free",
                     "The objective for this challenge is to buy a Samsung phone for free.",
-                    "challenge2-small.png", "challenge2.png", 12342, FLAGS.get(5), true)
+                    "challenge2-small.png", "challenge2.png", 12342),
+            new Voting("Photo comments",
+                    "n this challenge you can comment on the photo you will need to find the flag somewhere.",
+                    "challenge3-small.png", "challenge3.png", 12342)
     );
 
     @GetMapping("/login")
diff --git a/webgoat-lessons/challenge/src/main/resources/html/Challenge5.html b/webgoat-lessons/challenge/src/main/resources/html/Challenge5.html
index 0c715a599..7a5756ad9 100644
--- a/webgoat-lessons/challenge/src/main/resources/html/Challenge5.html
+++ b/webgoat-lessons/challenge/src/main/resources/html/Challenge5.html
@@ -43,7 +43,7 @@
                     <div>
                         <h3>Vote for your favorite</h3>
                     </div>
-                    <div class="list-group">
+                    <div id ="votesList" class="list-group">
                         <a href="#" class="list-group-item active">
                             <div class="media col-md-3">
                                 <figure>
diff --git a/webgoat-lessons/challenge/src/main/resources/js/challenge5.js b/webgoat-lessons/challenge/src/main/resources/js/challenge5.js
index 714978f9c..fe1e6f875 100644
--- a/webgoat-lessons/challenge/src/main/resources/js/challenge5.js
+++ b/webgoat-lessons/challenge/src/main/resources/js/challenge5.js
@@ -6,13 +6,54 @@ $(document).ready(function () {
 function login(user) {
     $("#name").text(user);
     $.get("votings/login?user=" + user, function (result, status) {
-
     });
+    getVotings();
 }
 
-function getVotings() {
-    $.get("votings/", function (result, status) {
+var html = '<a href="#" class="list-group-item ACTIVE">' +
+    '<div class="media col-md-3">' +
+    '<figure> ' +
+    '<img class="media-object img-rounded" src="images/IMAGE_SMALL" alt="placehold.it/350x250"/>' +
+    '</figure>' +
+    '</div> ' +
+    '<div class="col-md-6">' +
+    '<h4 class="list-group-item-heading">TITLE</h4>' +
+    '<p class="list-group-item-text">INFORMATION</p>' +
+    '</div>' +
+    '<div class="col-md-3 text-center">' +
+    '<h2>NO_VOTES' +
+    '<small> votes</small>' +
+    '</h2>' +
+    '<button type="button" class="btn BUTTON btn-lg btn-block">Vote Now!</button>' +
+    '<div class="stars"> ' +
+    '<span class="glyphicon glyphicon-star"></span>' +
+    '<span class="glyphicon glyphicon-star"></span>' +
+    '<span class="glyphicon glyphicon-star"></span>' +
+    '<span class="glyphicon glyphicon-star-empty"></span>' +
+    '</div>' +
+    '<p>Average AVERAGE<small> /</small>4</p>' +
+    '</div>' +
+    '<div class="clearfix"></div>' +
+    '</a>';
 
+function getVotings() {
+    $("#votesList").empty();
+    $.get("votings/", function (result, status) {
+        for (var i = 0; i < result.length; i++) {
+            var voteTemplate = html.replace('IMAGE_SMALL', result[i].imageSmall);
+            if ( i === 0 ) {
+                voteTemplate = voteTemplate.replace('ACTIVE', 'active');
+                voteTemplate = voteTemplate.replace('BUTTON', 'btn-default');
+            } else {
+                voteTemplate = voteTemplate.replace('ACTIVE', '');
+                voteTemplate = voteTemplate.replace('BUTTON', 'btn-primary');
+            }
+
+            voteTemplate = voteTemplate.replace('TITLE', result[i].title);
+            voteTemplate = voteTemplate.replace('INFORMATION', result[i].information || '');
+            voteTemplate = voteTemplate.replace('NO_VOTES', result[i].numberOfVotes || '');
+            $("#votesList").append(voteTemplate);
+        }
     })
 }