diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApi.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApi.java
index c7dc71d..c812508 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApi.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApi.java
@@ -1,6 +1,7 @@
 package lv.ctco.javaschool.eventorganaizer.boundary;
 
 import lv.ctco.javaschool.auth.control.UserStore;
+import lv.ctco.javaschool.auth.entity.domain.User;
 import lv.ctco.javaschool.eventorganaizer.control.AnswersStore;
 import lv.ctco.javaschool.eventorganaizer.control.EventStore;
 import lv.ctco.javaschool.eventorganaizer.control.PollStore;
@@ -13,13 +14,12 @@
 import lv.ctco.javaschool.eventorganaizer.entity.PollDto;
 import lv.ctco.javaschool.eventorganaizer.entity.TopicDto;
 import lv.ctco.javaschool.eventorganaizer.entity.TopicListDto;
+import lv.ctco.javaschool.eventorganaizer.entity.UserPoll;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ejb.Stateless;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
 import javax.persistence.EntityNotFoundException;
-import javax.persistence.PersistenceContext;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -32,9 +32,6 @@
 @Path("/event")
 @Stateless
 public class EventOrganizationApi {
-    @PersistenceContext
-    private EntityManager em;
-//
     @Inject
     private UserStore userStore;
 
@@ -122,14 +119,35 @@ public List<PollDto> getPollForEvent(@PathParam("id") Long id) {
 
     @POST
     @RolesAllowed({"ADMIN", "USER"})
-    @Path("/{id}/vote")
+    @Path("/vote/{id}")
     public void updateVoteCounter(@PathParam("id") Long id) {
-        Optional<Answer> answer = answersStore.getAnswerByID(id);
-        if (answer.isPresent()) {
-            answer.get().setCounter(answer.get().getCounter() + 1);
+        User currentUser = userStore.getCurrentUser();
+        Optional<Answer> userAnswer = answersStore.getAnswerByID(id);
+        if (userAnswer.isPresent()) {
+            Answer answer = userAnswer.get();
+            Optional<UserPoll> userVote = pollStore.getUserPollByUserAndPoll(currentUser, answer.getPoll());
+            if (userVote.isPresent()) {
+                throw new EntityNotFoundException();
+            }
+            registerNewUserPoll(currentUser, answer);
         }
     }
 
+    @GET
+    @RolesAllowed({"ADMIN", "USER"})
+    @Path("/{id}/getAnswers")
+    public List<PollDto> getPollsByEventId() {
+        User currentUser = userStore.getCurrentUser();
+        List<UserPoll> userPollList = pollStore.getUserPollByUser(currentUser);
+        List<PollDto> pollDtos = new ArrayList<>();
+        userPollList.forEach(up -> {
+            PollDto pollDto = new PollDto();
+            pollDto.setId(up.getPoll().getId());
+            pollDtos.add(pollDto);
+        });
+        return pollDtos;
+    }
+
     @GET
     @RolesAllowed({"ADMIN", "USER"})
     @Path("/{id}/getVotes")
@@ -138,7 +156,9 @@ public List<AnswerDto> getVotes(@PathParam("id") Long id) {
         List<AnswerDto> answerDtos = new ArrayList<>();
         poll.ifPresent(p -> {
             List<Answer> answerList = answersStore.getAnswersByPollID(p);
-            mapper.mapAnswerToAnswerDto(answerList);
+            mapper.mapAnswerToAnswerDto(answerList).forEach(a -> {
+                answerDtos.add(a);
+            });
         });
         return answerDtos;
     }
@@ -156,7 +176,8 @@ public List<PollDto> getFeedbackForEvent(@PathParam("id") Long id) {
     @Path("/{id}/getVotingPoll")
     public List<PollDto> getVotingForEvent(@PathParam("id") Long id) {
         List<Poll> poll = pollStore.getVotingPoll(id);
-        return mapper.mapPollToDto(poll);
+        List<PollDto> pollDtos = mapper.mapPollToDto(poll);
+        return pollDtos;
     }
 
     @POST
@@ -172,4 +193,12 @@ public void deleteEvent(@PathParam("id") Long id) throws IllegalArgumentExceptio
     public void deletePoll(@PathParam("id") Long id) throws IllegalArgumentException {
         pollStore.deletePollById(id);
     }
+
+    private void registerNewUserPoll(User currentUser, Answer answer) {
+        UserPoll newUserPoll = new UserPoll();
+        newUserPoll.setUser(currentUser);
+        newUserPoll.setPoll(answer.getPoll());
+        pollStore.persistUserPoll(newUserPoll);
+        answer.setCounter(answer.getCounter() + 1);
+    }
 }
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/Mapper.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/Mapper.java
index 3bfc277..897783b 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/Mapper.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/boundary/Mapper.java
@@ -5,7 +5,6 @@
 import lv.ctco.javaschool.eventorganaizer.entity.Poll;
 import lv.ctco.javaschool.eventorganaizer.entity.PollDto;
 
-import javax.ws.rs.PathParam;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -50,7 +49,7 @@ public List<AnswerDto> mapAnswerToAnswerDto(List<Answer> answerList) {
         List<AnswerDto> answerDtos = new ArrayList<>();
         answerList.forEach(al -> {
             AnswerDto a = new AnswerDto();
-            a.setAnswerCounter(al.getCounter());
+            a.setCounter(al.getCounter());
             a.setThisAnswerID(al.getId());
             answerDtos.add(a);
         });
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/control/AnswersStore.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/control/AnswersStore.java
index 92ceb70..a68e466 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/control/AnswersStore.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/control/AnswersStore.java
@@ -1,7 +1,9 @@
 package lv.ctco.javaschool.eventorganaizer.control;
 
+import lv.ctco.javaschool.auth.entity.domain.User;
 import lv.ctco.javaschool.eventorganaizer.entity.Answer;
 import lv.ctco.javaschool.eventorganaizer.entity.Poll;
+import lv.ctco.javaschool.eventorganaizer.entity.UserPoll;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
@@ -15,9 +17,6 @@ public class AnswersStore {
     @PersistenceContext
     private EntityManager em;
 
-    @Inject
-    private AnswersStore answersStore;
-
     public List<Answer> getAnswersByPollID(Poll poll) {
         return em.createQuery("select a from Answer a" +
                 " where a.poll = :poll", Answer.class)
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/control/EventStore.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/control/EventStore.java
index 43e5cb2..39eb32c 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/control/EventStore.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/control/EventStore.java
@@ -22,13 +22,11 @@ public class EventStore {
     private UserStore userStore;
 
     public List<Event> getAllEvents() {
-        List<Event> list;
-        list = em.createQuery("select e from Event e" +
+        return em.createQuery("select e from Event e" +
                 " where e.status = :status1 or e.status=:status2", Event.class)
                 .setParameter("status1", EventStatus.OPEN)
                 .setParameter("status2", EventStatus.CLOSED)
                 .getResultList();
-        return list;
     }
 
     public Optional<Event> getEventById(Long id) {
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/control/PollStore.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/control/PollStore.java
index 1bff644..1f18ffd 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/control/PollStore.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/control/PollStore.java
@@ -1,7 +1,9 @@
 package lv.ctco.javaschool.eventorganaizer.control;
 
-import lv.ctco.javaschool.eventorganaizer.entity.Event;
+import lv.ctco.javaschool.auth.entity.domain.User;
+import lv.ctco.javaschool.eventorganaizer.entity.Answer;
 import lv.ctco.javaschool.eventorganaizer.entity.Poll;
+import lv.ctco.javaschool.eventorganaizer.entity.UserPoll;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
@@ -15,9 +17,6 @@ public class PollStore {
     @PersistenceContext
     private EntityManager em;
 
-    @Inject
-    private PollStore pollStore;
-
     public List<Poll> getPollForEvent(Long id) {
         return em.createQuery("select  p from Poll p" +
                 " where p.eventID=:id", Poll.class)
@@ -34,14 +33,14 @@ public int deletePollById(Long id) {
 
     public List<Poll> getVotingPoll(Long id) {
         return em.createQuery("select  p from Poll p" +
-                " where p.eventID=:id and p.isFeedback=false", Poll.class)
+                " where p.eventID = :id and p.isFeedback = false", Poll.class)
                 .setParameter("id", id)
                 .getResultList();
     }
 
     public List<Poll> getFeedbackPoll(Long id) {
         return em.createQuery("select p from Poll p" +
-                " where p.eventID=:id and p.isFeedback=true", Poll.class)
+                " where p.eventID = :id and p.isFeedback = true", Poll.class)
                 .setParameter("id", id)
                 .getResultList();
     }
@@ -54,6 +53,26 @@ public Optional<Poll> getPollById (Long id) {
                 .findFirst();
     }
 
+    public Optional<UserPoll> getUserPollByUserAndPoll(User user, Poll poll) {
+        return em.createQuery("select ua from UserPoll ua" +
+                " where ua.user = :user and ua.poll = :poll", UserPoll.class)
+                .setParameter("user", user)
+                .setParameter("poll", poll)
+                .getResultStream()
+                .findFirst();
+    }
+
+    public List<UserPoll> getUserPollByUser(User user) {
+        return em.createQuery("select ua from UserPoll ua" +
+                " where ua.user = :user", UserPoll.class)
+                .setParameter("user", user)
+                .getResultList();
+    }
+
+    public void persistUserPoll(UserPoll userPoll) {
+        em.persist(userPoll);
+    }
+
     public void persistPoll(Poll poll) {
         em.persist(poll);
     }
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/Answer.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/Answer.java
index a622e3d..dea672f 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/Answer.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/Answer.java
@@ -51,4 +51,4 @@ public int getCounter() {
     public void setCounter(int counter) {
         this.counter = counter;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/AnswerDto.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/AnswerDto.java
index 30bfef7..73fa9c5 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/AnswerDto.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/AnswerDto.java
@@ -2,7 +2,7 @@
 
 public class AnswerDto {
     private Long thisAnswerID;
-    private int answerCounter;
+    private int counter;
     private String text;
 
     public AnswerDto() {
@@ -10,7 +10,7 @@ public AnswerDto() {
 
     public AnswerDto(Long answerID, int counter) {
         this.thisAnswerID = answerID;
-        this.answerCounter = counter;
+        this.counter = counter;
     }
 
     public Long getThisAnswerID() {
@@ -21,12 +21,12 @@ public void setThisAnswerID(Long thisAnswerID) {
         this.thisAnswerID = thisAnswerID;
     }
 
-    public int getAnswerCounter() {
-        return answerCounter;
+    public int getCounter() {
+        return counter;
     }
 
-    public void setAnswerCounter(int answerCounter) {
-        this.answerCounter = answerCounter;
+    public void setCounter(int counter) {
+        this.counter = counter;
     }
 
     public String getText() {
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/Event.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/Event.java
index a855e73..50594e3 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/Event.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/Event.java
@@ -3,25 +3,32 @@
 import lv.ctco.javaschool.auth.entity.domain.User;
 
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
+@Table(name = "events")
 public class Event {
     @Id
     @GeneratedValue
     private Long id;
 
-    private String name;
-
     @ManyToOne
+    @JoinColumn(name = "user_id")
     private User author;
 
+    private String name;
     private String date;
     private String time;
     private String description;
     private String agenda;
+
+    @Enumerated(EnumType.STRING)
     private EventStatus status;
 
     public Event() {
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/EventDto.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/EventDto.java
index 3088b41..2eec592 100644
--- a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/EventDto.java
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/EventDto.java
@@ -1,80 +1,80 @@
 package lv.ctco.javaschool.eventorganaizer.entity;
 
 public class EventDto {
-    private String eventName;
-    private String eventDescription;
-    private String eventDate;
-    private String eventTime;
-    private Long eventID;
-    private String eventAgenda;
-    private EventStatus eventStatus;
+    private String name;
+    private String description;
+    private String date;
+    private String time;
+    private Long id;
+    private String agenda;
+    private EventStatus status;
 
     public EventDto() {
     }
 
     public EventDto(String name, String description, String date, String time, Long id, String agenda, EventStatus status) {
-        this.eventName = name;
-        this.eventDescription = description;
-        this.eventDate = date;
-        this.eventTime = time;
-        this.eventID = id;
-        this.eventAgenda = agenda;
-        this.eventStatus = status;
+        this.name = name;
+        this.description = description;
+        this.date = date;
+        this.time = time;
+        this.id = id;
+        this.agenda = agenda;
+        this.status = status;
     }
 
-    public long getEventID() {
-        return eventID;
+    public long getId() {
+        return id;
     }
 
-    public void setEventID(long eventID) {
-        this.eventID = eventID;
+    public void setId(long id) {
+        this.id = id;
     }
 
-    public String getEventName() {
-        return eventName;
+    public String getName() {
+        return name;
     }
 
-    public void setEventName(String eventName) {
-        this.eventName = eventName;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public String getEventDescription() {
-        return eventDescription;
+    public String getDescription() {
+        return description;
     }
 
-    public void setEventDescription(String eventDescription) {
-        this.eventDescription = eventDescription;
+    public void setDescription(String description) {
+        this.description = description;
     }
 
-    public String getEventDate() {
-        return eventDate;
+    public String getDate() {
+        return date;
     }
 
-    public void setEventDate(String eventDate) {
-        this.eventDate = eventDate;
+    public void setDate(String date) {
+        this.date = date;
     }
 
-    public String getEventAgenda() {
-        return eventAgenda;
+    public String getAgenda() {
+        return agenda;
     }
 
-    public void setEventAgenda(String eventAgenda) {
-        this.eventAgenda = eventAgenda;
+    public void setAgenda(String agenda) {
+        this.agenda = agenda;
     }
 
-    public String getEventTime() {
-        return eventTime;
+    public String getTime() {
+        return time;
     }
 
-    public void setEventTime(String eventTime) {
-        this.eventTime = eventTime;
+    public void setTime(String time) {
+        this.time = time;
     }
 
-    public EventStatus getEventStatus() {
-        return eventStatus;
+    public EventStatus getStatus() {
+        return status;
     }
 
-    public void setEventStatus(EventStatus eventStatus) {
-        this.eventStatus = eventStatus;
+    public void setStatus(EventStatus status) {
+        this.status = status;
     }
 }
diff --git a/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/UserPoll.java b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/UserPoll.java
new file mode 100644
index 0000000..0a820da
--- /dev/null
+++ b/src/main/java/lv/ctco/javaschool/eventorganaizer/entity/UserPoll.java
@@ -0,0 +1,50 @@
+package lv.ctco.javaschool.eventorganaizer.entity;
+
+import lv.ctco.javaschool.auth.entity.domain.User;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "user_answer")
+public class UserPoll {
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "poll_id")
+    private Poll poll;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public Poll getPoll() {
+        return poll;
+    }
+
+    public void setPoll(Poll answer) {
+        this.poll = answer;
+    }
+}
diff --git a/src/main/resources/META-INF/load.sql b/src/main/resources/META-INF/load.sql
index 589258d..4ea138c 100644
--- a/src/main/resources/META-INF/load.sql
+++ b/src/main/resources/META-INF/load.sql
@@ -1,2 +1,8 @@
 INSERT INTO USERS (ID, USERNAME, PASSWORD, ROLE) VALUES (-1, 'admin', 'PBKDF2WithHmacSHA256:2048:McY8GmR3k1PjMwJQE97wYxbdCuJ2f7bBfwiNlOMT2Bc=:qnB+F68kaLGTITEiYfg8s+7+L1/5AKbiWgkKC4g2VKE=', 'ADMIN');
-INSERT INTO USERS (ID, USERNAME, PASSWORD, ROLE) VALUES (-2, 'user1', 'PBKDF2WithHmacSHA256:2048:McY8GmR3k1PjMwJQE97wYxbdCuJ2f7bBfwiNlOMT2Bc=:qnB+F68kaLGTITEiYfg8s+7+L1/5AKbiWgkKC4g2VKE=', 'USER');
\ No newline at end of file
+INSERT INTO USERS (ID, USERNAME, PASSWORD, ROLE) VALUES (-2, 'user1', 'PBKDF2WithHmacSHA256:2048:McY8GmR3k1PjMwJQE97wYxbdCuJ2f7bBfwiNlOMT2Bc=:qnB+F68kaLGTITEiYfg8s+7+L1/5AKbiWgkKC4g2VKE=', 'USER');
+INSERT INTO USERS (ID, USERNAME, PASSWORD, ROLE) VALUES (-3, 'user2', 'PBKDF2WithHmacSHA256:2048:McY8GmR3k1PjMwJQE97wYxbdCuJ2f7bBfwiNlOMT2Bc=:qnB+F68kaLGTITEiYfg8s+7+L1/5AKbiWgkKC4g2VKE=', 'USER');
+INSERT INTO USERS (ID, USERNAME, PASSWORD, ROLE) VALUES (-4, 'user3', 'PBKDF2WithHmacSHA256:2048:McY8GmR3k1PjMwJQE97wYxbdCuJ2f7bBfwiNlOMT2Bc=:qnB+F68kaLGTITEiYfg8s+7+L1/5AKbiWgkKC4g2VKE=', 'USER');
+INSERT INTO EVENTS (ID, USER_ID, NAME, DATE, TIME, DESCRIPTION, AGENDA, STATUS) VALUES (101, -2, 'event-1',  '09/05/2018', '5:00pm', 'desc-1', 'agenda-1', 'OPEN');
+INSERT INTO EVENTS (ID, USER_ID, NAME, DATE, TIME, DESCRIPTION, AGENDA, STATUS) VALUES (102, -3, 'event-2',  '09/06/2018', '6:00pm', 'desc-2', 'agenda-2', 'OPEN');
+INSERT INTO EVENTS (ID, USER_ID, NAME, DATE, TIME, DESCRIPTION, AGENDA, STATUS) VALUES (103, -4, 'event-3',  '09/07/2018', '7:00pm', 'desc-3', 'agenda-3', 'OPEN');
+INSERT INTO EVENTS (ID, USER_ID, NAME, DATE, TIME, DESCRIPTION, AGENDA, STATUS) VALUES (104, -2, 'event-4',  '09/08/2018', '8:00pm', 'desc-4', 'agenda-4', 'OPEN');
\ No newline at end of file
diff --git a/src/main/webapp/app/add-event.jsp b/src/main/webapp/app/add-event.jsp
index 4229926..e6bf844 100644
--- a/src/main/webapp/app/add-event.jsp
+++ b/src/main/webapp/app/add-event.jsp
@@ -28,9 +28,9 @@
     <p><input type="text" id="timepicker"></p>
     <p id="setStatus"><b>Set status</b></p>
     <p id="statuses">
-        <b><input type="checkbox" id="open">Open</b>
-        <b><input type="checkbox" id="closed">Closed</b>
-        <b><input type="checkbox" id="finished">Finished</b>
+        <input type="radio" id="open" name="event_status" value="open" title="open"/>Open<br/>
+        <input type="radio" id="closed" name="event_status" value="closed" title="closed"/>Closed<br/>
+        <input type="radio" id="finished" name="event_status" value="finished" title="finished"/>Finished
     </p>
 </form>
 <div id="buttons">
diff --git a/src/main/webapp/app/event.jsp b/src/main/webapp/app/event.jsp
index cfcf31f..4d16a08 100644
--- a/src/main/webapp/app/event.jsp
+++ b/src/main/webapp/app/event.jsp
@@ -2,7 +2,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title id="title">{{eventName}}</title>
+    <title id="title">{{name}}</title>
     <script src="https://www.w3schools.com/lib/w3.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.11/handlebars.min.js"></script>
     <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
@@ -16,13 +16,13 @@
     <button type="button" onclick="addEvent()">Add Event</button>
 </div>
 <div id="event-field" class="w3-hide">
-    <h1>{{eventName}}</h1>
+    <h1>{{name}}</h1>
     <div>
-        <h4>{{eventDate}} &nbsp</h4>
-        <h4>{{eventTime}}</h4>
+        <h4>{{date}} &nbsp</h4>
+        <h4>{{time}}</h4>
     </div>
-    <p>{{eventDescription}}</p>
-    <p>{{eventAgenda}}</p>
+    <p>{{description}}</p>
+    <p>{{agenda}}</p>
 </div>
 <script id="pollList" type="text/x-handlebars-template">
     {{#pollArray}}
@@ -32,14 +32,14 @@
         <p><b>Answers:</b></p>
         {{#answers}}
         <div>
-            <input type="radio" name="quest{{../id}}" value="{{thisAnswerID}}" id="{{thisAnswerID}}"><label
-                for="{{thisAnswerID}}">{{text}}</label>
-            <div id="votes" class="w3-hide"><label
-                    for="{{thisAnswerID}}">Votes: {{answerCounter}}</label></div>
-
+            <input type="radio" name="quest{{../id}}" value="{{thisAnswerID}}" id="{{thisAnswerID}}">
+            <label for="{{thisAnswerID}}">{{text}}</label>
+            <div class="votes">
+                <label for="{{thisAnswerID}}" name="votes{{../id}}"></label>
+            </div>
         </div>
         {{/answers}}
-        <button id="voteButton{{../id}}" onclick="vote({{id}}),showStatistics({{id}})">VOTE!</button>
+        <button id="voteButton{{id}}" class="" onclick="vote({{id}})">VOTE!</button>
         <hr/>
     </div>
     {{/pollArray}}
diff --git a/src/main/webapp/app/my-events.jsp b/src/main/webapp/app/my-events.jsp
index 2628a32..1c5fe15 100644
--- a/src/main/webapp/app/my-events.jsp
+++ b/src/main/webapp/app/my-events.jsp
@@ -16,11 +16,11 @@
 </p>
 <ul class="w3-ul" id="myevent-list">
     <li w3-repeat="eventList" type="text" id="eventElement" class="w3-hide">
-        <a href="<c:url value='/app/event.jsp'/>?id={{eventID}}">{{eventName}}</a>
+        <a href="<c:url value='/app/event.jsp'/>?id={{id}}">{{name}}</a>
         <p>
-            <button onclick="goToEditPage('{{eventID}}')" id="goToEdit">Edit</button>
-            <button onclick="deleteEvent('{{eventID}}'),window.location.reload()" id="delete">Delete</button>
-            <button onclick="goToCreatePollPage('{{eventID}}')" id="createPoolButton">Create Pool</button>
+            <button onclick="goToEditPage('{{id}}')" id="goToEdit">Edit</button>
+            <button onclick="deleteEvent('{{id}}'),window.location.reload()" id="delete">Delete</button>
+            <button onclick="goToCreatePollPage('{{id}}')" id="createPoolButton">Create Pool</button>
         </p>
     </li>
 </ul>
diff --git a/src/main/webapp/app/poll.jsp b/src/main/webapp/app/poll.jsp
index e80e032..1350fcf 100644
--- a/src/main/webapp/app/poll.jsp
+++ b/src/main/webapp/app/poll.jsp
@@ -15,9 +15,9 @@
     <button onclick="goToTheMainPage()">Go to the main page</button>
 </p>
 <div id="event-field" class="w3-hide">
-    <h2>Event name: {{eventName}}</h2>
-    <h4>Event data: {{eventDate}}</h4>
-    <h5>Event ID: {{eventID}}</h5>
+    <h2>Event name: {{name}}</h2>
+    <h4>Event data: {{date}}</h4>
+    <h5>Event ID: {{id}}</h5>
 </div>
 <form name="pollform" method="post" style="padding: 15px">
     <p><b>Question</b></p>
@@ -38,8 +38,8 @@
         <p><b>Answers:</b></p>
         {{#answers}}
         <div>
-            <input type="radio" name="quest{{../id}}" value="{{thisAnswerID}}" id="{{thisAnswerID}}"><label
-                for="{{thisAnswerID}}">{{text}}</label>
+            <input type="radio" name="quest{{../id}}" value="{{thisAnswerID}}" id="{{thisAnswerID}}">
+            <label for="{{thisAnswerID}}">{{text}}</label>
         </div>
         {{/answers}}
         <p><b>Feedback poll:</b></p>
diff --git a/src/main/webapp/javascript/add-event.js b/src/main/webapp/javascript/add-event.js
index 5da7a94..1f83c72 100644
--- a/src/main/webapp/javascript/add-event.js
+++ b/src/main/webapp/javascript/add-event.js
@@ -7,28 +7,28 @@ function goToTheMainPage() {
 
 function getDataFromTextarea() {
     var name = document.getElementById("name");
-    data["name"] = (name.value).trim();
+    data.name = (name.value).trim();
     var description = document.getElementById("description");
-    data["description"] = (description.value).trim();
+    data.description = (description.value).trim();
     var agenda = document.getElementById("agenda");
-    data["agenda"] = (agenda.value).trim();
+    data.agenda = (agenda.value).trim();
     var eventdate = document.getElementById("datepicker");
-    data["date"] = eventdate.value;
+    data.date = eventdate.value;
     var eventtime = document.getElementById("timepicker");
-    data["time"] = (eventtime.value).trim();
+    data.time = (eventtime.value).trim();
 
     var statusClosed = document.getElementById("closed");
     var statusFinished = document.getElementById("finished");
     var statusOpen = document.getElementById("open");
     if (statusClosed.checked) {
-        data["status"] = "CLOSED";
+        data.status = "CLOSED";
     } else if (statusFinished.checked) {
-        data["status"] = "FINISHED";
+        data.status = "FINISHED";
     } else if (statusOpen.checked) {
-        data["status"] = "OPEN";
+        data.status = "OPEN";
     }
     if (id) {
-        data["id"] = id;
+        data.id = id;
     }
     return data;
 }
@@ -39,7 +39,6 @@ function checkNonEmptyInput(data) {
         && validateField(data.agenda, "Agenda")
         && validateField(data.date, "Date")
         && validateField(data.time, "Time");
-
 }
 
 function validateField(field, message) {
@@ -115,11 +114,11 @@ function getEventData() {
     }).then(function (response) {
         return response.json();
     }).then(function (event) {
-        document.getElementById("name").value = event.eventName;
-        document.getElementById("description").value = event.eventDescription;
-        document.getElementById("datepicker").value = event.eventDate;
-        document.getElementById("timepicker").value = event.eventTime;
-        document.getElementById("agenda").value = event.eventAgenda;
+        document.getElementById("name").value = event.name;
+        document.getElementById("description").value = event.description;
+        document.getElementById("datepicker").value = event.date;
+        document.getElementById("timepicker").value = event.time;
+        document.getElementById("agenda").value = event.agenda;
     })
 }
 
diff --git a/src/main/webapp/javascript/event.js b/src/main/webapp/javascript/event.js
index 091fd72..d8d8ac1 100644
--- a/src/main/webapp/javascript/event.js
+++ b/src/main/webapp/javascript/event.js
@@ -10,19 +10,20 @@ function loadEvent() {
     }).then(function (response) {
         return response.json();
     }).then(function (event) {
-        console.log(JSON.stringify(event));
         if (event !== undefined) {
             document.getElementById("event-field").classList.remove("w3-hide");
             w3.displayObject("title", event);
             w3.displayObject("event-field", event);
-        } else if (event.eventStatus === "OPEN") {
+        }
+        if (event.status === "OPEN") {
             document.getElementById("voting").classList.remove("w3-hide");
             document.getElementById("feedback").classList.add("w3-hide");
             getVotingPoll();
-        } else if (event.eventStatus === "CLOSED") {
+            hidePoll(id);
+        } else if (event.status === "CLOSED") {
             document.getElementById("voting").classList.add("w3-hide");
             document.getElementById("feedback").classList.remove("w3-hide");
-            getFeedbackPoll()
+            getFeedbackPoll();
         }
     })
 }
@@ -67,7 +68,6 @@ function getVotingPoll() {
             var source = document.getElementById("pollList").innerHTML;
             var template = Handlebars.compile(source);
             document.getElementById("voting").innerHTML = template(context);
-
         }
     })
 }
@@ -75,8 +75,7 @@ function getVotingPoll() {
 function vote(id) {
     var checked = document.querySelector('input[name=quest' + id + ']:checked');
     var checkedAddr = checked.id;
-    console.log("checked:" + checkedAddr);
-    fetch('/api/event/' + checkedAddr + '/vote/', {
+    fetch('/api/event/vote/' + checkedAddr, {
         "method": "POST",
         headers: {
             'Accept': 'application/json',
@@ -84,7 +83,7 @@ function vote(id) {
         }
     }).then(function (response) {
         showStatistics(id);
-        hideVotes();
+        hideVotes(id);
     });
 }
 
@@ -98,16 +97,36 @@ function showStatistics(x) {
     }).then(function (response) {
         return response.json();
     }).then(function (answers) {
-        console.log(answers);
-        document.getElementById("votes").value = answers.answerCounter;
+        var input = document.getElementsByName("quest" + x);
+        var votes = document.getElementsByName("votes" + x);
+        for (i = 0; i < votes.length; i++) {
+            input[i].disabled = true;
+            votes[i].innerHTML = "Votes:" + answers[i].counter;
+        }
     });
+}
 
+function hideVotes(x) {
+    document.getElementById("voteButton" + x).classList.add("w3-hide");
 }
 
-function hideVotes() {
-    document.getElementById("votes").classList.remove("w3-hide");
-    document.getElementById("voteButton").classList.add("w3-hide");
-    console.log("DONE");
+function hidePoll() {
+    fetch('/api/event/' + id + '/getAnswers/', {
+        "method": "GET",
+        headers: {
+            'Accept': 'application/json',
+            'Content-Type': 'application/json'
+        }
+    }).then(function (response) {
+        return response.json();
+    }).then(function (answers) {
+        if (Object.keys(answers).length > 0) {
+            for (i = 0; i < Object.keys(answers).length; i++) {
+                showStatistics(answers[Object.keys(answers)[i]].id);
+                hideVotes(answers[Object.keys(answers)[i]].id);
+            }
+        }
+    });
 }
 
 function addEvent() {
diff --git a/src/main/webapp/javascript/event_logic.js b/src/main/webapp/javascript/event_logic.js
deleted file mode 100644
index be417b0..0000000
--- a/src/main/webapp/javascript/event_logic.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function loadEvent() {
-    var id = getQueryVariable("id");
-    fetch('/api/event/' + id, {
-        "method": "GET",
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json'
-        },
-    }).then(function (response) {
-        return response.json();
-    }).then(function (event) {
-        console.log(JSON.stringify(event));
-        if (event !== undefined) {
-            document.getElementById("event-field").classList.remove("w3-hide");
-            w3.displayObject("title", event);
-            w3.displayObject("event-field", event);
-        }
-    })
-}
-
-function getQueryVariable(variable) {
-    var query = window.location.search.substring(1);
-    var vars = query.split("&");
-    for (var i = 0; i < vars.length; i++) {
-        var pair = vars[i].split("=");
-        if (pair[0] == variable) {
-            return pair[1];
-        }
-    }
-    return (false);
-}
-
-function addEvent() {
-    location.href = "/app/add-event.jsp"
-}
-
-function main() {
-    location.href = "/app/jsp/start.jsp"
-}
-
-function myEvents() {
-    location.href = "/app/jsp/my-events.jsp"
-}
diff --git a/src/main/webapp/javascript/login.js b/src/main/webapp/javascript/login.js
index 0dc8344..d99cf4e 100644
--- a/src/main/webapp/javascript/login.js
+++ b/src/main/webapp/javascript/login.js
@@ -28,14 +28,12 @@ function switchRegistration() {
 
 function login() {
     hideError();
-    console.log("start login");
     var usernameTxt = document.getElementById("username-txt");
     var passwordTxt = document.getElementById("password1-txt");
     var dto = {
         "username": usernameTxt.value,
         "password": passwordTxt.value
     };
-    console.log("sending login data");
     fetch('/api/auth/login', {
         "method": "POST",
         headers: {
@@ -45,7 +43,6 @@ function login() {
         body: JSON.stringify(dto)
     }).then(function (response) {
         if (response.status === 200) {
-            console.log("login success");
             location.href = '/app/start.jsp';
         } else {
             showError("Username or Password is incorrect!");
@@ -55,7 +52,6 @@ function login() {
 
 function register() {
     hideError();
-    console.log("start registration");
     var usernameTxt = document.getElementById("username-txt");
     var password1Txt = document.getElementById("password1-txt");
     var password2Txt = document.getElementById("password2-txt");
@@ -69,7 +65,6 @@ function register() {
         "username": usernameTxt.value,
         "password": pwd1
     };
-    console.log("sending registration data");
     fetch('/api/auth/register', {
         "method": "POST",
         headers: {
@@ -79,7 +74,6 @@ function register() {
         body: JSON.stringify(dto)
     }).then(function (response) {
         if (response.status === 200) {
-            console.log("registration success");
             location.href = '/app/start.jsp';
         } else if (response.status === 401) {
             showError("Something is wrong!");
diff --git a/src/main/webapp/javascript/my-events.js b/src/main/webapp/javascript/my-events.js
index bae5f05..f8bf8a5 100644
--- a/src/main/webapp/javascript/my-events.js
+++ b/src/main/webapp/javascript/my-events.js
@@ -16,7 +16,6 @@ function getEventsFromDB() {
     }).then(function (response) {
         return response.json();
     }).then(function (events) {
-        console.log(events);
         if (events.length > 0) {
             document.getElementById("eventElement").classList.remove("w3-hide");
             w3DisplayData("myevent-list", new EventList(events));
diff --git a/src/main/webapp/javascript/poll.js b/src/main/webapp/javascript/poll.js
index 50eff00..a35fc69 100644
--- a/src/main/webapp/javascript/poll.js
+++ b/src/main/webapp/javascript/poll.js
@@ -17,7 +17,6 @@ function buildData() {
     data["answers"] = splitAnswers();
     var isFeedback = document.getElementById("isFeedback");
     data["isFeedback"] = isFeedback.checked;
-    console.log(data);
     return data;
 }
 
@@ -51,7 +50,6 @@ function getPollFromDB() {
         } else {
             document.getElementById("displayPoll").classList.remove("w3-hide");
             var context = {pollArray: poll};
-            console.log(context);
             var source = document.getElementById("pollList").innerHTML;
             var template = Handlebars.compile(source);
             document.getElementById("displayPoll").innerHTML = template(context);
@@ -82,7 +80,6 @@ function loadEvent() {
     }).then(function (response) {
         return response.json();
     }).then(function (event) {
-        console.log(JSON.stringify(event));
         if (event !== undefined) {
             document.getElementById("event-field").classList.remove("w3-hide");
             w3.displayObject("event-field", event);
diff --git a/src/main/webapp/javascript/start.js b/src/main/webapp/javascript/start.js
index 07b0c24..e73d054 100644
--- a/src/main/webapp/javascript/start.js
+++ b/src/main/webapp/javascript/start.js
@@ -17,7 +17,6 @@ function checkTopics() {
         if (topics.topicList.length > 0) {
             document.getElementById("topic-list").classList.remove("w3-hide");
             w3DisplayData("topic-list", topics);
-            console.log(topics);
         }
     })
 }
diff --git a/src/test/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApiTest.java b/src/test/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApiTest.java
index 2a4257a..425d7f7 100644
--- a/src/test/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApiTest.java
+++ b/src/test/java/lv/ctco/javaschool/eventorganaizer/boundary/EventOrganizationApiTest.java
@@ -85,7 +85,7 @@ void testReturnEmptyDto() {
     void testFindById() {
         when(eventStore.getEventById((long) 1))
                 .thenReturn(java.util.Optional.ofNullable(event));
-        assertEquals(eventDto.getEventID(), eventOrganizationApi.getEventById((long) 1).getEventID());
+        assertEquals(eventDto.getId(), eventOrganizationApi.getEventById((long) 1).getId());
     }
 
     @Test
@@ -111,8 +111,8 @@ void testGetAllAuthorsEvents() {
         assertEquals(1, result.size());
 
         EventDto eventDto = result.get(0);
-        assertEquals("qwe", eventDto.getEventName());
-        assertEquals(1, eventDto.getEventID());
+        assertEquals("qwe", eventDto.getName());
+        assertEquals(1, eventDto.getId());
     }
 
     @Test
@@ -140,12 +140,12 @@ private Event initEvent() {
 
     private EventDto initEventDto(Event event) {
         EventDto eventDto = new EventDto();
-        eventDto.setEventName(event.getName());
-        eventDto.setEventDate(event.getDate());
-        eventDto.setEventDescription(event.getDescription());
-        eventDto.setEventID(event.getId());
-        eventDto.setEventAgenda(event.getAgenda());
-        eventDto.setEventDate(event.getDate());
+        eventDto.setName(event.getName());
+        eventDto.setDate(event.getDate());
+        eventDto.setDescription(event.getDescription());
+        eventDto.setId(event.getId());
+        eventDto.setAgenda(event.getAgenda());
+        eventDto.setDate(event.getDate());
         return eventDto;
     }
 }
\ No newline at end of file