Index: Sources/target/classes/templates/discussion.html
===================================================================
--- Sources/target/classes/templates/discussion.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/discussion.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,66 @@
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+    <div style="width: 85%; text-align: justify; margin: auto; clear: both">
+        <div style="background-color: rgba(128,128,128, 0.2); border-radius: 20px; padding: 20px">
+            <h1 th:text="${disc.getTitle()}" style="width: 80%; display: inline; height: fit-content; clear: both"></h1>
+        </div>
+        <hr>
+        <div>
+            <h5 th:text="${disc.getText()}" style="width: 90%; margin: auto; background-color: lightblue; border-radius: 4px; padding: 20px"></h5>
+        </div>
+        <br>
+        <h4>
+            <span th:if="${!disc.getUser().equals(user)}" sec:authorize="isAuthenticated()">
+                <a class='btn btn-success button-like-discussion' th:if="${!likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >❤</a>
+                <a class='btn btn-danger button-unlike-discussion' th:if="${likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >💔</a>
+            </span>
+            <span>Број на допаѓања:</span>
+            <span th:text="${disc.getLikes()}" id="likes_count"></span>
+        </h4>
+        <br>
+        <h6 style="width: 60%; float:left;">
+            <a th:href="@{'/profiles/{id}' (id=${disc.getUser().getUserId()})}" >
+            <span th:text="${'Поставено од: '+disc.getUser().getUsername()}"></span>
+            </a>
+            <span th:text="${', на датум '+ disc.getDate()}"></span>
+            <br>
+            <span>Поставено за </span>
+            <span th:text="${disc.getMovie() != null ? 'Филмот ' + disc.getMovie().getTitle() : 'Актерот ' + disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}" ></span>
+        </h6>
+        <div style="float: right"  sec:authorize="isAuthenticated()">
+            <a th:if="${disc.getUser().equals(user)}" class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Промени</a>
+            <a th:if="${disc.getUser().equals(user)}" class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a>
+            <a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a>
+
+        </div><br>
+    </div>
+    <table class="table table-striped" style="width: 70%; margin: auto;">
+        <thead>
+        <tr>
+            <th scope="col">Реплика</th>
+            <th scope="col">Поставена на</th>
+            <th scope="col">Поставена од</th>
+            <th:block  sec:authorize="isAuthenticated()">
+                <th scope="col"></th>
+                <th scope="col"></th>
+            </th:block>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="reply : ${replies}" class="movie">
+            <td th:text="${reply.getText()}"></td>
+            <td th:text="${reply.getDate()}"></td>
+            <td >
+                <a th:href="@{'/profiles/{id}' (id=${reply.getUser().getUserId()})}" th:text="${reply.getUser().getUsername()}"></a>
+            </td>
+            <td th:if="${reply.getUser().equals(user)}"><a class="btn btn-warning" th:href="@{'/replies/edit/{discussionId}/{replyId}' (discussionId=${disc.getDiscussionId()},replyId=${reply.getReplyId()})}">Промени</a> </td>
+            <td th:if="${reply.getUser().equals(user)}"><a class="btn btn-danger button-delete-reply" th:reply-id="${reply.getReplyId()}" th:dicsussion-id="${disc.getDiscussionId()}">Избриши</a> </td>
+            <th:block sec:authorize="isAuthenticated()">
+                <td th:if="${!reply.getUser().equals(user)}">
+                    <a class="btn btn-success">👍 </a>
+                    <a class="btn btn-danger">👎</a>
+                </td>
+            </th:block>
+        </tr>
+        </tbody>
+    </table>
+</div>
Index: Sources/target/classes/templates/discussionForType.html
===================================================================
--- Sources/target/classes/templates/discussionForType.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/discussionForType.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,53 @@
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+
+    <div class="container mb-4">
+        <div class="row">
+            <div class="col-12" th:if="${discussions.size() > 0}">
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">Наслов</th>
+                            <th scope="col">Опис</th>
+                            <th scope="col">Датум</th>
+                            <th scope="col">Корисник</th>
+                            <th:block  sec:authorize="isAuthenticated()">
+                                <th:block>
+                                    <th scope="col"></th>
+                                    <th scope="col"></th>
+                                </th:block>
+                                <th scope="col"></th>
+                                <th scope="col"></th>
+                            </th:block>
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="disc : ${discussions}" class="movie">
+                            <td>
+                                <a th:text="${disc.getTitle()}" th:href="@{'/discussions/{id}' (id=${disc.getDiscussionId()})}"></a>
+                            </td>
+                            <td th:text="${disc.getText()}"></td>
+                            <td th:text="${disc.getDate()}"></td>
+                            <td th:text="${disc.getUser().getUsername()}"></td>
+                            <td th:if="${disc.getUser().equals(user)}"><a class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Измени</a> </td>
+                            <td th:if="${disc.getUser().equals(user)}"><a class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a> </td>
+
+                            <th:block sec:authorize="isAuthenticated()">
+                                <td th:if="${!disc.getUser().equals(user)}"><a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> </td>
+                                <td th:if="${!disc.getUser().equals(user)}">
+                                    <a class="btn btn-success">👍 </a>
+                                    <a class="btn btn-danger">👎</a>
+                                </td>
+                            </th:block>
+
+
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
Index: Sources/target/classes/templates/discussionsAdd.html
===================================================================
--- Sources/target/classes/templates/discussionsAdd.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/discussionsAdd.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,72 @@
+<main xmlns:th="http://www.thymeleaf.org">
+
+    <div class="container">
+        <div class="row">
+            <div class="col-md-5">
+                <form th:action="@{'/discussions/save/{discussionId}' (discussionId = ${discussion?.getDiscussionId()})}" method="POST">
+                    <div class="form-group">
+
+                        <label for="title">Наслов</label>
+                        <input type="text"
+                               class="form-control"
+                               id="title"
+                               name="title"
+                               th:value="${discussion?.getTitle()}"
+                               required
+                               placeholder="Наслов">
+                    </div>
+                    <div class="form-group">
+                        <label for="text">Опис</label>
+                        <input type="text"
+                               class="form-control"
+                               id="text"
+                               name="text"
+                               th:value="${discussion?.getText()}"
+                               multiple
+                               placeholder="Опис">
+                    </div>
+
+                    <div>
+                        <input type="radio"
+                               class="form-control discussion-type"
+                               name="type"
+                               th:value="M"
+                               th:text="Филм"
+                               th:checked="${discussion?.getType() != null && discussion.getType().toString().equals('M')}"
+
+                        >
+                        <input type="radio"
+                               class="form-control discussion-type"
+                               name="type"
+                               th:value="P"
+                               th:text="Личност"
+                               th:checked="${discussion?.getType() != null && discussion.getType().toString().equals('P')}">
+                    </div>
+
+
+
+
+                    <div class="form-group">
+                        <select name="idDiscussed" class="selected-discussion">
+                            <option></option>
+                            <option class="movies-discussion" th:each="movie:${movies}" th:value="${movie.getMovieId()}"
+                                    th:text="${movie.getTitle()}"
+                                    th:selected="${discussion?.getMovie()?.equals(movie)}"></option>
+
+                            <option class="persons-discussion" th:each="person:${persons}" th:value="${person.getPersonId()}"
+                                    th:text="${person.getName() + ' ' + person.getSurname()}"
+                                    th:selected="${discussion?.getPerson()?.equals(person)}"></option>
+
+                        </select>
+                    </div>
+
+
+                    <button id="submit" type="submit" class="btn btn-primary">Submit</button>
+                    <a type="button" class="btn btn-primary" th:href="@{/discussions}">Back</a>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+</main>
Index: Sources/target/classes/templates/discussionsList.html
===================================================================
--- Sources/target/classes/templates/discussionsList.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/discussionsList.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,55 @@
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+    <div class="container mb-4">
+        <a sec:authorize="isAuthenticated()" th:href="@{/discussions/add}" class="btn btn-secondary">Додади нова дискусија</a>
+    </div>
+    <div class="container mb-4">
+            <div class="col-12" th:if="${discussions.size() > 0}">
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">За</th>
+                            <th scope="col">Наслов</th>
+                            <th scope="col">Допаѓања</th>
+                            <th scope="col">Датум</th>
+                            <th scope="col">Корисник</th>
+                            <th:block  sec:authorize="isAuthenticated()">
+                                <th:block>
+                                    <th scope="col"></th>
+                                    <th scope="col"></th>
+                                </th:block>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            </th:block>
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="disc : ${discussions}" class="movie">
+                            <td th:text="${disc.getMovie() != null ? 'Филмот ' + disc.getMovie().getTitle() : 'Актерот ' + disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}"></td>
+                            <td>
+                                <a th:text="${disc.getTitle()}" th:href="@{'/discussions/{id}' (id=${disc.getDiscussionId()})}"></a>
+                            </td>
+                            <td th:text="${disc.getLikes() != null ? disc.getLikes() : 0}"  class="likes_count">
+                            </td>
+                            <td th:text="${disc.getDate()}"></td>
+                            <td th:text="${disc.getUser().getUsername()}"></td>
+                            <td th:if="${disc.getUser().equals(user)}"><a class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Измени</a> </td>
+                            <td th:if="${disc.getUser().equals(user)}"><a class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a> </td>
+
+                            <th:block sec:authorize="isAuthenticated()">
+                            <td th:if="${!disc.getUser().equals(user)}"><a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> </td>
+                            <td th:if="${!disc.getUser().equals(user)}">
+                                <a class='btn btn-success button-like-discussion-alt' th:if="${!likedDiscussions.contains(disc)}" th:discussion-id="${disc?.getDiscussionId()}" th:user-id="${user.getUserId()}" >❤</a>
+                                <a class='btn btn-danger button-unlike-discussion-alt' th:if="${likedDiscussions.contains(disc)}" th:discussion-id="${disc?.getDiscussionId()}" th:user-id="${user.getUserId()}" >💔</a>
+                            </td>
+                            </th:block>
+
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+    </div>
+
+</div>
Index: Sources/target/classes/templates/favoriteList.html
===================================================================
--- Sources/target/classes/templates/favoriteList.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/favoriteList.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,53 @@
+<div class="container mb-4" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+    <div class="row" th:each="row: ${movie_rows}" >
+        <div class="col-md-3" th:each="movie: ${row}" >
+            <a class="card-text-center" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}" >
+                    <div class="card-body card bg-image" th:style="'background:url(' + ${movie.getImageUrl()} + ') no-repeat center #eee;'">
+                        <h3 class="card-title title" th:text="${movie.getTitle()}"></h3>
+                        <h3 class="card-text bottom" th:text="${'Rated '+movie.getImdbRating()}"></h3>
+                    </div>
+            </a>
+        </div>
+    </div>
+
+    <!--<div class="row">
+        <div class="col-12" th:if="${movies.size() > 0}">
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th scope="col">Наслов</th>
+                        <th scope="col">Опис</th>
+                        <th scope="col">Датум издавање</th>
+                        <th scope="col">Допаѓања</th>
+                        <th scope="col">Занрови</th>
+                        <th scope="col">Актери</th>
+                        <th scope="col">Режисер</th>
+
+
+
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr th:each="movie : ${movies}" class="elements">
+                        <td th:text="${movie.getTitle()}"></td>
+                        <td th:text="${movie.getDescription()}"></td>
+                        <td th:text="${movie.getAiringDate()}"></td>
+                        <td th:text="${movie.getLikes() != null  ? movie.getLikes().size() : 0}">
+
+                        </td>
+                        <td class="genre">
+                            <div th:each="g: ${movie.getGenres()}" th:text="${g.getGenre().genreType }"></div>
+                        </td>
+                        <td>
+                            <div th:each="a: ${movie.getActors()}" th:text="${a.getPerson().getName()} "></div>
+                        </td>
+                        <td th:text="${movie.getDirector() != null ? movie.getDirector()?.getName() + ' '+ movie.getDirector()?.getSurname() : 'Не е додаен директор'}"></td>
+
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>-->
+</div>
Index: Sources/target/classes/templates/fragments/header.html
===================================================================
--- Sources/target/classes/templates/fragments/header.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/fragments/header.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,63 @@
+<header xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+    <nav class="navbar navbar-expand-md navbar-dark bg-dark">
+        <div class="container">
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                    aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+                <ul class="navbar-nav m-auto">
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/movies">Филмови</a>
+                    </li>
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/actors">Актери</a>
+                    </li>
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/directors">Режисери</a>
+                    </li>
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/discussions">Дискусии</a>
+                    </li>
+                    <li class="nav-item m-auto">
+                        <a class="nav-link active" href="/genres">Жанрови</a>
+                    </li>
+                    <li class="nav-item m-auto" sec:authorize="isAuthenticated()">
+                        <a class="nav-link active" href="/favoriteList">Омилена листа</a>
+                    </li>
+                </ul>
+                <form class="form-inline my-2 my-lg-0 hidden">
+                    <div class="input-group input-group-sm">
+                        <input type="text" class="form-control" aria-label="Small"
+                               aria-describedby="inputGroup-sizing-sm"
+                               placeholder="Search...">
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-secondary btn-number">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        </div>
+                    </div>
+                </form>
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="nav-item" sec:authorize="isAuthenticated()">
+                        <a class="nav-link" href="#">
+                            <th:block th:if="${#request.getRemoteUser() != null}"
+                                      th:text="${#request.getRemoteUser()}"></th:block>
+                        </a>
+                    </li>
+
+                    <li class="nav-item" sec:authorize="isAuthenticated()">
+                        <a class="btn btn-light btn-sm ml-3" href="/logout">
+                            <i class="fa fa-shopping-cart"></i> Одјави се
+                        </a>
+                    </li>
+                    <li class="nav-item" sec:authorize="!isAuthenticated()">
+                        <a class="btn btn-light btn-sm ml-3" href="/login">
+                            <i class="fa fa-shopping-cart"></i> Најави се
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+</header>
Index: Sources/target/classes/templates/fragments/searchBarGenre.html
===================================================================
--- Sources/target/classes/templates/fragments/searchBarGenre.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/fragments/searchBarGenre.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,9 @@
+<div xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" style="width:60%; margin: auto; margin-bottom: 10px">
+        <select th:if="${genres!=null}" id="searchGenre" class="form-control" style="float: left; display: block; width: 50%">
+            <option value="" selected>Сите</option>
+            <option th:each="genre: ${genres}" th:value="${genre.getGenreType()}" th:text="${genre.getGenreType()}"></option>
+        </select>
+        <div class="input-group-append" style="width: 40%">
+            <button class="btn btn-secondary  search-button" style="width: 100%">Филтрирај по жанр</button>
+        </div>
+</div>
Index: Sources/target/classes/templates/fragments/searchBarName.html
===================================================================
--- Sources/target/classes/templates/fragments/searchBarName.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/fragments/searchBarName.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,8 @@
+<div style="width:60%; margin: auto;">
+    <input id="searchTitle" class="form-control" style="float: left; display: block; width: 50%" type="text" placeholder="...">
+
+    <div class="input-group-append" style="width: 40%">
+        <button class="btn btn-secondary search-button-title" style="width: 100%">Филтрирај по Наслов</button>
+    </div>
+
+</div>
Index: Sources/target/classes/templates/genres.html
===================================================================
--- Sources/target/classes/templates/genres.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/genres.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,30 @@
+<div class="container mb-4" xmlns:sec="http://www.w3.org/1999/xhtml">
+
+    <div class="row">
+      <div class="col-12">
+        <div class="table-responsive">
+          <table class="table table-striped">
+            <thead>
+            <tr>
+              <th scope="col">Име</th>
+              <th scope="col">Лајкови</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="genre : ${genres}" class="elements">
+              <td th:text="${genre.getName()}"></td>
+              <td th:text="${genre.getLikes()}" th:id="${genre.getGenreId()+'genre'}"></td>
+              <td>
+                <th:block sec:authorize="isAuthenticated()" th:each="g: ${allGenres}" th:if="${g.getGenreId() == genre.getGenreId()}">
+                  <a class="btn btn-success button-add-genre-liked-list" th:genre-id="${g.getGenreId()}" th:user-id="${user.getUserId()}" th:if="${!likedGenres.contains(g)}">❤</a>
+                  <a class="btn btn-danger button-remove-genre-liked-list" th:genre-id="${g.getGenreId()}" th:user-id="${user.getUserId()}" th:if="${likedGenres.contains(g)}">💔</a>
+                </th:block>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+
+  </div>
+</div>
Index: Sources/target/classes/templates/login.html
===================================================================
--- Sources/target/classes/templates/login.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/login.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,20 @@
+<div class="container" xmlns:th="http://www.thymeleaf.org">
+    <form class="form-signin mt-xl-5" method="post" action="/login">
+        <h2 class="form-signin-heading">Sign in</h2>
+        <p>
+            <label for="username" class="sr-only">Username</label>
+            <input type="text" id="username" name="username" class="form-control" placeholder="Username" required=""
+                   autofocus="">
+        </p>
+        <p>
+            <label for="password" class="sr-only">Password</label>
+            <input type="password" id="password" name="password" class="form-control" placeholder="Password"
+                   required="">
+        </p>
+
+        <div th:text="${param.error}" class="text-danger"></div>
+
+        <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
+    </form>
+    <a th:href="@{/register}" class="btn btn-block btn-light">Register here</a>
+</div>
Index: Sources/target/classes/templates/movieShow.html
===================================================================
--- Sources/target/classes/templates/movieShow.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/movieShow.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,107 @@
+<style>
+    #admin-buttons button{
+        float:left;
+        margin: 20px !important;
+    }
+
+    #admin-buttons{
+        width: 60%;
+        margin: auto;
+    }
+</style>
+
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml" style="width: 80%; margin: auto">
+    <div>
+        <div style="width: 30%; margin-right: 10px; padding:20px; border-right: 3px solid black; border-radius: 10px; float:left" id="image-movie-section">
+            <img th:src="${movie.getImageUrl()}" style="width: 90%; height: auto; clear: both; margin-bottom: 20px">
+            <div id="admin-buttons">
+                <a class="btn btn-primary" th:href="@{'/discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a>
+                <th:block sec:authorize="isAuthenticated()" >
+                    <div>
+                        <a class="btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">❤</a>
+                        <a class="btn btn-danger button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">💔</a>
+                    </div>
+                    <a class="btn btn-secondary button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
+                    <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Промени</a>
+                    <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
+                </th:block>
+            </div>
+        </div>
+
+        <div style="width: 60%; margin-left: 10px; padding:20px; float:left">
+            <h1 th:text="${movie.getTitle()}" style="text-align: center; padding:10px; background-color: rgba(64,64,64,0.5); color:white; border-radius: 10px 0px"></h1>
+            <hr>
+            <h3>
+                <span>Режисер:</span>
+                <a th:if="${movie.getDirector() != null}" th:text="${movie.getDirector().getName() + ' ' + movie.getDirector().getSurname()}" th:href="@{'/persons/{id}' (id=${movie.getDirector().getPersonId()})}"></a>
+                <span th:if="${movie.getDirector() == null}"> / </span>
+            </h3>
+            <h3 th:text="${'IMDB оцена: ' + movie.getImdbRating()}"></h3>
+            <h3 th:text="${'Прикажан на: ' + movie.getDateFormatted()}"></h3>
+
+            <div style="background-color: rgba(200,200,200,0.5); border-radius: 10px; padding:15px; ">
+                <h3>Краток опис:</h3>
+                <p th:text="${movie.getDescription()}" style="text-align: justify"></p>
+            </div>
+
+            <div id="likes-showcase">
+                <h4 style="text-align: center">
+                    <span>Филмот му се допаднал на </span>
+                    <strong th:text="${likes}" id="movie_likes_count"></strong>
+                    <span> корисници</span>
+                </h4>
+            </div>
+
+            <div class="person-movies-list genres-listing">
+                <h3>Жанрови:</h3>
+                <ul>
+                    <li th:each="genre: ${movie.getGenres()}" th:text="${genre.getGenre().getGenreType()}"></li>
+                </ul>
+            </div>
+            <div class="person-movies-list">
+                <h3>Актери:</h3>
+                <ul>
+                    <li th:each="actor: ${movie.getActors()}"><a th:text="${actor.getPerson().getName() + ' ' + actor.getPerson().getSurname()}" th:href="@{'/persons/{id}' (id=${actor.getPerson().getPersonId()})}" ></a></li>
+                </ul>
+            </div>
+
+        </div>
+    </div>
+
+    <hr>
+    <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Бројот на оцени кои филмот ги добил:</span>
+            <span th:text="${movie.getRates().size()}"></span>
+        </h2>
+        <hr>
+        <div th:each="rating: ${movie.getRates()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 130px;">
+                <div style="width: 60%; float:left;">
+                    <a th:href="@{'/profiles/{id}' (id=${rating.getUser().getUserId()})}">
+                        <h4 th:text="${'Oд: '+rating.getUser().getName() + ' ' + rating.getUser().getSurname()}"> </h4>
+                    </a>
+                    <p th:text="${rating.getReason()}" style="text-align: justify"></p>
+                </div>
+                <div style="width: 30%; float:right; background-color: darkorange; border-radius: 10px 30px; color: whitesmoke; padding: 10px;">
+                    <h2 style="text-align: center">Оценет:</h2>
+                    <p th:text="${rating.getStarsRated() + ' од 10'}" style="text-align: center"></p>
+                </div>
+        </div>
+    </div>
+    <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Лајковите кои филмот ги добил:</span>
+        </h2>
+        <hr>
+        <div th:each="liked: ${movie.getLikes()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 60px;">
+            <div style="width: 100%; float:left;">
+                <a th:href="@{'/profiles/{id}' (id=${liked.getUser().getUserId()})}" >
+                    <h3  style="text-align: center">
+                        <span th:text="${liked.getUser().getName() + ' ' + liked.getUser().getSurname()}"></span>
+                        <span style="color: green; font-size: 100%" >✔</span>
+                    </h3>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
Index: Sources/target/classes/templates/moviesAdd.html
===================================================================
--- Sources/target/classes/templates/moviesAdd.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/moviesAdd.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,90 @@
+<main xmlns:th="http://www.thymeleaf.org">
+
+    <div class="container">
+        <div class="row">
+            <div class="col-md-5">
+                <form th:action="@{'/movies/save/{movieId}' (movieId = ${movie?.getMovieId()})}" method="POST">
+                    <div class="form-group">
+                        <label for="title">Наслов</label>
+                        <input type="text"
+                               class="form-control"
+                               id="title"
+                               name="title"
+                               th:value="${movie?.getTitle()}"
+                               required
+                               placeholder="Наслов">
+                    </div>
+                    <div class="form-group">
+                        <label for="description">Опис</label>
+                        <input type="text"
+                               multiple
+                               class="form-control"
+                               id="description"
+                               name="description"
+                               th:value="${movie?.getDescription()}"
+                               placeholder="Опис">
+                    </div>
+                    <div class="form-group">
+                        <label for="imageUrl">Слика</label>
+                        <input type="text"
+                               class="form-control"
+                               id="imageUrl"
+                               name="imageUrl"
+                               th:value="${movie?.getImageUrl()}"
+                               placeholder="Слика">
+                    </div>
+                    <div class="form-group">
+                        <label for="airingDate">Датум на издавање</label>
+                        <input type="date"
+                               class="form-control"
+                               id="airingDate"
+                               name="airingDate"
+                               th:value="${movie?.getAiringDate()}"
+                               placeholder="Датум на издавање">
+                    </div>
+                    <div class="form-group">
+                        <label for="rating">Рејтинг</label>
+                        <input type="number"
+                               step="0.01"
+                               class="form-control"
+                               id="rating"
+                               name="rating"
+                               th:value="${movie?.getImdbRating()}"
+                               placeholder="Рејтинг">
+                    </div>
+                    <div class="form-group">
+                        <select name="directorId">
+                            <option></option>
+                            <option th:each="dir:${directors}" th:value="${dir.getPersonId()}" th:text="${dir.getName() + ' ' + dir.getSurname()}"
+                            th:selected="${director?.equals(dir)}"></option>
+
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <select name="actors" multiple>
+                            <option></option>
+                            <option th:each="act:${actors}" th:value="${act.getPersonId()}"
+                                    th:text="${act.getName() + ' ' + act.getSurname()}"
+                                    th:selected="${movieActors?.contains(act)}"></option>
+
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <select name="genres" multiple>
+                            <option></option>
+                            <option th:each="genr:${genres}" th:value="${genr.getGenreId()}"
+                                    th:text="${genr.getGenreType()}"
+                                    th:selected="${movieGenres?.contains(genr)}"></option>
+
+                        </select>
+                    </div>
+
+                    <button id="submit" type="submit" class="btn btn-primary">Submit</button>
+                    <a type="button" class="btn btn-primary" href="/products">Back</a>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+</main>
Index: Sources/target/classes/templates/moviesList.html
===================================================================
--- Sources/target/classes/templates/moviesList.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/moviesList.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,105 @@
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+
+    <div style="width: 70%; margin: auto">
+        <div th:replace="fragments/searchBarName"></div><br>
+        <div th:replace="fragments/searchBarGenre"></div>
+    </div>
+
+    <div class="container mb-4">
+        <a  sec:authorize="isAuthenticated()" th:href="@{/movies/add}">Додади нов филм</a>
+    </div>
+
+    <div class="container mb-4">
+        <div class="row" th:each="row: ${movie_rows}" >
+            <div class="col-md-3 elements" th:each="movie: ${row}" >
+                    <div class="card-body card bg-image" th:style="'background:url(' + ${movie.getImageUrl()} + ') no-repeat center #eee;'">
+                        <a class="card-text-center" style="color: white" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}" >
+                        <h3 class="card-title title" th:text="${movie.getTitle()}"></h3>
+                            <span th:each="genre: ${movie.getGenres()}"  th:text="${genre?.getGenre()?.getGenreType()}" hidden class="card-genre"></span>
+
+                        </a>
+                        <h3 class="card-text bottom" th:text="${'Rated '+movie.getImdbRating()}"></h3>
+                        <th:block sec:authorize="isAuthenticated()">
+                            <a class="bottom-heart btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">❤</a>
+                            <a class="bottom-heart btn btn-danger button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">💔</a>
+                        </th:block>
+                    </div>
+            </div>
+        </div>
+    </div>
+    <!--<div class="container mb-4">
+        <div class="row">
+            <div class="col-12" th:if="${movies.size() > 0}">
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">Наслов</th>
+                            <th scope="col">Опис</th>
+                            <th scope="col">Датум издавање</th>
+                            <th scope="col">Допаѓања</th>
+                            <th scope="col">Жанрови</th>
+                            <th scope="col">Актери</th>
+                            <th scope="col">Режисер</th>
+                            <th  scope="col"></th>
+
+                            <th:block sec:authorize="isAuthenticated()">
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            </th:block>
+
+
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="movie : ${movies}" class="elements">
+                            <td><a th:text="${movie.getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}"></a></td>
+                            <td th:text="${movie.getDescription()}"></td>
+                            <td th:text="${movie.getAiringDate()}"></td>
+                            <td th:text="${movie.getLikes() != null  ? movie.getLikes().size() : 0}">
+
+                            </td>
+                            <td class="genre">
+                                <div th:each="g: ${movie.getGenres()}" th:text="${g.getGenre().genreType }"></div>
+                            </td>
+                            <td>
+                                <div th:each="ac: ${movie.getActors()}">
+                                    <a th:href="@{'/persons/{id}' (id=${ac.getPerson().getPersonId()})}" th:text="${ac.getPerson().getName() + ' ' + ac.getPerson().getSurname()}"></a>
+                                </div>
+                            </td>
+                            <td th:if="${movie.getDirector() != null}">
+                                <a th:href="@{'/persons/{id}' (id=${movie.getDirector().getPersonId()})}" th:text="${movie.getDirector().getName() + ' ' + movie.getDirector().getSurname()}"></a>
+                            </td>
+                            <td th:if="${movie.getDirector() == null}">
+                                Филмот нема режисер.
+                            </td>
+                            <td>
+                                <a class="btn btn-primary" th:href="@{'discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a>
+                            </td>
+                            <th:block sec:authorize="isAuthenticated()">
+                            <td>
+                                <a class="btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">Додади во омилена листа</a>
+                                <a class="btn btn-warning button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">Избриши од омилена листа</a>
+                            </td>
+                            <td>
+                                <a class="btn btn-success button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
+                            </td>
+                            <td>
+                                <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Измени</a>
+                            </td>
+                            <td>
+                                <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
+                            </td>
+                            </th:block>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>-->
+
+</div>
Index: Sources/target/classes/templates/moviesListPaged.html
===================================================================
--- Sources/target/classes/templates/moviesListPaged.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/moviesListPaged.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,130 @@
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+    <div style="margin:auto; width: 60%">
+        <div style="width: 30%; margin: auto; height: 100%; margin-bottom: 10px">
+            <a class="btn btn-outline-dark" style="height: 100%; width: 100%; font-size: 125%" id="button_toggle_filters">Прикажи филтрирање</a>
+        </div>
+        <div style="width: 100%; margin: auto; transition: 200ms" id="filters_div" class="invisible-search">
+            <div th:replace="fragments/searchBarName"></div><br>
+            <div th:replace="fragments/searchBarGenre"></div>
+        </div>
+    </div>
+    <div id="paging-section">
+        <div id="inner-paging" class="input-group">
+            <!--
+            <a class="btn btn-danger" id="button-sub" style="float: left; display: block">Previous</a>
+            <a class="btn btn-success" id="button-add" style="float: left; display: block">Next</a>
+            -->
+            <div class="input-group-prepend">
+                <button class="btn btn-danger" id="button-sub" >Previous</button>
+            </div>
+            <form method="get" action="" style="float: left; display: block">
+                <input type="number" class="form-control" min="1" name="page" th:value="${page}" id="pageInput">
+                <button type="submit" id="button-submit-page" class="btn btn-primary">Check page</button>
+            </form>
+
+            <div class="input-group-append">
+                <button class="btn btn-success" id="button-add" >Next</button>
+            </div>
+        </div>
+    </div><br>
+
+    <div class="container mb-4">
+        <a  sec:authorize="isAuthenticated()" th:href="@{/movies/add}" class="btn btn-secondary">Додади нов филм</a>
+    </div>
+
+    <div class="container mb-4">
+        <div class="row" th:each="row: ${movie_rows}" >
+            <div class="col-md-3 elements" th:each="movie: ${row}" >
+                <span th:each="genre: ${movie.getGenres()}"  th:text="${genre?.getGenre()?.getGenreType()}" hidden class="card-genre"></span>
+                    <div class="card-body card bg-image" th:style="'background:url(' + ${movie.getImageUrl()} + ') no-repeat center #eee;'">
+                        <a class="card-text-center" style="color: white" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}" >
+                        <h3 class="card-title title" th:text="${movie.getTitle()}"></h3>
+                            <span th:each="genre: ${movie.getGenres()}"  th:text="${genre?.getGenre()?.getGenreType()}" hidden class="card-genre"></span>
+                        </a>
+                        <span class="card-text bottom">
+                            <h3 th:text="${'Оценет '+movie.getImdbRating() + '/10'}"></h3>
+                        </span>
+                        <th:block sec:authorize="isAuthenticated()">
+                            <button class="bottom-heart btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">❤</button>
+                            <button class="bottom-heart btn btn-danger button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">💔</button>
+                        </th:block>
+                    </div>
+            </div>
+        </div>
+    </div>
+    <!--<div class="container mb-4">
+        <div class="row">
+            <div class="col-12" th:if="${movies.size() > 0}">
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">Наслов</th>
+                            <th scope="col">Опис</th>
+                            <th scope="col">Датум издавање</th>
+                            <th scope="col">Допаѓања</th>
+                            <th scope="col">Жанрови</th>
+                            <th scope="col">Актери</th>
+                            <th scope="col">Режисер</th>
+                            <th  scope="col"></th>
+
+                            <th:block sec:authorize="isAuthenticated()">
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                            </th:block>
+
+
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="movie : ${movies}" class="elements">
+                            <td><a th:text="${movie.getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}"></a></td>
+                            <td th:text="${movie.getDescription()}"></td>
+                            <td th:text="${movie.getAiringDate()}"></td>
+                            <td th:text="${movie.getLikes() != null  ? movie.getLikes().size() : 0}">
+
+                            </td>
+                            <td class="genre">
+                                <div th:each="g: ${movie.getGenres()}" th:text="${g.getGenre().genreType }"></div>
+                            </td>
+                            <td>
+                                <div th:each="ac: ${movie.getActors()}">
+                                    <a th:href="@{'/persons/{id}' (id=${ac.getPerson().getPersonId()})}" th:text="${ac.getPerson().getName() + ' ' + ac.getPerson().getSurname()}"></a>
+                                </div>
+                            </td>
+                            <td th:if="${movie.getDirector() != null}">
+                                <a th:href="@{'/persons/{id}' (id=${movie.getDirector().getPersonId()})}" th:text="${movie.getDirector().getName() + ' ' + movie.getDirector().getSurname()}"></a>
+                            </td>
+                            <td th:if="${movie.getDirector() == null}">
+                                Филмот нема режисер.
+                            </td>
+                            <td>
+                                <a class="btn btn-primary" th:href="@{'discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a>
+                            </td>
+                            <th:block sec:authorize="isAuthenticated()">
+                            <td>
+                                <a class="btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">Додади во омилена листа</a>
+                                <a class="btn btn-warning button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">Избриши од омилена листа</a>
+                            </td>
+                            <td>
+                                <a class="btn btn-success button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
+                            </td>
+                            <td>
+                                <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Измени</a>
+                            </td>
+                            <td>
+                                <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
+                            </td>
+                            </th:block>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>-->
+
+</div>
Index: Sources/target/classes/templates/personShow.html
===================================================================
--- Sources/target/classes/templates/personShow.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/personShow.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,62 @@
+
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml" style="width: 70%; margin: auto">
+    <div style="clear: both; margin-bottom: 10px; display:  inline-block">
+        <div style="width: 60%; margin-left: 10px; padding:20px; float:left">
+            <h1 th:text="${person.getName() + ' ' + person.getSurname()}" style="text-align: center; padding:10px; background-color: rgba(64,64,64,0.5); color:white; border-radius: 10px 0px"></h1>
+            <hr>
+            <h3 th:text="${'Роден/а на: ' + person.getDateFormatted()}"></h3>
+            <div style="background-color: rgba(200,200,200,0.5); border-radius: 10px; padding:15px; ">
+                <h3>Краток Опис:</h3>
+                <p th:text="${person.getDescription()}" style="text-align: justify"></p>
+            </div>
+
+            <div th:if="${person.getType().toString().contains('D')}" class="person-movies-list">
+                <h3 >Режисирани филмови:</h3>
+                <hr>
+                <ul>
+                    <li th:each="movie: ${person.getMovies()}"><a th:text="${movie.getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}" ></a></li>
+                </ul>
+            </div>
+            <div th:if="${person.getType().toString().contains('A')}" class="person-movies-list">
+                <h3 >Се појавува во филмовите:</h3>
+                <hr>
+                <ul>
+                    <li th:each="movie: ${person.getMovieActors()}" ><a th:text="${movie.getMovie().getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovie().getMovieId()})}" ></a></li>
+                </ul>
+            </div><br>
+            <ul style="list-style-type: none; width: 100%; margin: auto" id="buttons-person">
+                <li><a class="btn btn-primary" th:href="@{'discussions/all/{id}?type=P' (id=${person.getPersonId()})}" >Прегледај дискусии</a></li>
+                <th:block sec:authorize="isAuthenticated()">
+                    <li><a class="btn btn-secondary button-add-grade-person" th:person-id="${person.getPersonId()}" th:if="${!person.hasGradeFromUser(user)}">Остави оценка</a></li>
+                    <li><a class="btn btn-secondary button-add-grade-person" th:person-id="${person.getPersonId()}" th:if="${person.hasGradeFromUser(user)}">Промени оценка</a></li>
+                    <li><a class="btn btn-warning" th:href="@{'persons/edit/{personId}' (personId = ${person.getPersonId()})}">Промени</a></li>
+                    <li><a class="btn btn-danger button-delete-actor" th:person-id="${person.getPersonId()}">Избриши</a></li>
+                </th:block>
+            </ul>
+        </div>
+        <div style="width: 30%; margin-left: 10px; padding:20px; border-left: 3px solid black; border-radius: 10px; float:right">
+            <img th:src="${person.getImageUrl()}" style="width: 90%; height: auto">
+        </div>
+    </div>
+    <br>
+    <div style="clear:both; display: inline-block; width: 100%; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
+        <h2>
+            <span>Бројот на оцени кои личноста ги има добиено:</span>
+            <span th:text="${person.getPersonRates().size()}"></span>
+        </h2>
+        <hr>
+        <div th:each="rating: ${person.getPersonRates()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 130px;">
+            <div style="width: 60%; float:left;">
+                <a th:href="@{'/profiles/{id}' (id=${rating.getUser().getUserId()})}">
+                    <h4 th:text="${'Oд: '+rating.getUser().getName() + ' ' + rating.getUser().getSurname()}"> </h4>
+                </a>
+                <p th:text="${rating.getReason()}" style="text-align: justify"></p>
+            </div>
+            <div style="width: 30%; float:right; background-color: darkorange; border-radius: 10px 30px; color: whitesmoke; padding: 10px;">
+                <h2 style="text-align: center">Оценет со :</h2>
+                <p th:text="${rating.getStarsRated() + ' од 10'}" style="text-align: center"></p>
+            </div>
+        </div>
+    </div>
+
+</div>
Index: Sources/target/classes/templates/personsAdd.html
===================================================================
--- Sources/target/classes/templates/personsAdd.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/personsAdd.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,99 @@
+<main xmlns:th="http://www.thymeleaf.org">
+
+    <div class="container">
+        <div class="row">
+            <div class="col-md-5">
+                <form th:action="@{'/persons/save/{personId}' (personId = ${person?.getPersonId()})}" method="POST">
+                    <div class="form-group">
+
+                        <label for="name">Име</label>
+                        <input type="text"
+                               class="form-control"
+                               id="name"
+                               name="name"
+                               th:value="${person?.getName()}"
+                               required
+                               placeholder="Име">
+                    </div>
+                    <div class="form-group">
+                        <label for="surname">Презиме</label>
+                        <input type="text"
+                               class="form-control"
+                               id="surname"
+                               name="surname"
+                               th:value="${person?.getSurname()}"
+                               placeholder="Презиме">
+                    </div>
+                    <div class="form-group">
+                        <label for="description">Опис</label>
+                        <input type="text"
+                               class="form-control"
+                               id="description"
+                               name="description"
+                               th:value="${person?.getDescription()}"
+                               placeholder="Опис">
+                    </div>
+                    <div>
+                        <input type="radio"
+                               class="form-control person-movies"
+                               name="type"
+                               th:value="A"
+                               th:text="Актер"
+                               th:checked="${person?.getType() != null && person.getType().toString().equals('A')}"
+
+                        >
+                        <input type="radio"
+                               class="form-control person-movies"
+                               name="type"
+                               th:value="D"
+                               th:text="Режисер"
+                               th:checked="${person?.getType() != null && person.getType().toString().equals('D') }">
+                    </div>
+                    <div class="form-group">
+                        <label for="imageUrl">Слика</label>
+                        <input type="text"
+                               class="form-control"
+                               id="imageUrl"
+                               name="imageUrl"
+                               th:value="${person?.getImageUrl()}"
+                               placeholder="Слика">
+                    </div>
+                    <div class="form-group">
+                        <label for="birthDate">Датум на раѓање</label>
+                        <input type="date"
+                               class="form-control"
+                               id="birthDate"
+                               name="birthDate"
+                               th:value="${person?.getDateOfBirth()}"
+                               placeholder="Датум на раѓање">
+                    </div>
+
+
+                    <div class="form-group">
+                        <select name="movieIds" multiple>
+                            <option></option>
+                            <option th:each="movie:${moviesActors}" th:value="${movie.getMovieId()}"
+                                    th:text="${movie.getTitle()}"
+                                    th:selected="${movieActors?.contains(movie)}"
+                                    th:hidden="${person != null && person.getType().toString()=='D'}"
+                            class="movies-actors"></option>
+
+                            <option th:each="movie:${moviesDirectors}" th:value="${movie.getMovieId()}"
+                                    th:text="${movie.getTitle()}"
+                                    th:selected="${movieActors?.contains(movie)}"
+                                    th:hidden="${person != null && person.getType().toString()=='A'}"
+                            class="movie-directors"></option>
+
+                        </select>
+                    </div>
+
+
+                    <button id="submit" type="submit" class="btn btn-primary">Submit</button>
+                    <a type="button" class="btn btn-primary" th:href="@{/actors}">Back</a>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+</main>
Index: Sources/target/classes/templates/personsList.html
===================================================================
--- Sources/target/classes/templates/personsList.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/personsList.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,68 @@
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+
+    <div style="width: 70%; margin: auto;">
+        <a sec:authorize="isAuthenticated()" th:href="@{'persons/add'}" class="btn btn-secondary">Додади актер или режисер</a>
+    </div>
+    <div class="container mb-4">
+            <div class="col-12" th:if="${persons.size() > 0}">
+                <div class="table-responsive">
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">Име</th>
+                            <!--<th scope="col">Презиме</th>-->
+                            <th scope="col">Датум рагање</th>
+                            <!--<th scope="col">Опис</th>-->
+<!--                            <th scope="col">Занрови</th>-->
+                            <th scope="col">Слика</th>
+
+                            <th scope="col">Филмови</th>
+                            <th scope="col"></th>
+                            <th:block sec:authorize="isAuthenticated()">
+                            <th scope="col"></th>
+                            <th scope="col"></th>
+                                <th scope="col"></th>
+
+                            </th:block>
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr th:each="person : ${persons}" class="elements">
+                            <td><a th:href="@{'/persons/{id}' (id=${person.getPersonId()})}" th:text="${person.getName() + ' ' + person.getSurname()}"></a></td>
+                            <!--<td th:text="${person.getSurname()}"></td>-->
+                            <td th:text="${person.getDateOfBirth()}"></td>
+                            <!--<td th:text="${person.getDescription()}"></td>-->
+
+<!--                            <td>-->
+<!--                                <div th:each="g: ${person.getGenres()}" th:text="${g.getGenre().genreType }"></div>-->
+<!--                            </td>-->
+                            <td><img th:src="${person.getImageUrl()}" style="width: 20%; height: 20%"/></td>
+                            <td>
+                                <div th:each="m: ${person.getMovieActors().size() > 0 ? person.getMovieActors() : person.getMovies()}"
+                                     th:text="${m.getClass().getName() == 'com.wediscussmovies.project.model.relation.MovieActors'  ? m.getMovie().getTitle() : m.getTitle()} "></div>
+                            </td>
+                            <td> <a class="btn btn-primary" th:href="@{'discussions/all/{id}?type=P' (id=${person.getPersonId()})}" >Прегледај дискусии</a></td>
+                            <th:block sec:authorize="isAuthenticated()">
+                                <td>
+                                    <a class="btn btn-secondary button-add-grade-person" th:person-id="${person.getPersonId()}">Остави оценка</a>
+                                </td>
+                            <td>
+                                <a class="btn btn-warning" th:href="@{'persons/edit/{personId}' (personId = ${person.getPersonId()})}">Промени</a>
+                            </td>
+                            <td>
+                                <a class="btn btn-danger button-delete-actor" th:person-id="${person.getPersonId()}">Избриши</a>
+
+                            </td>
+
+
+                            </th:block>
+
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+    </div>
+
+</div>
Index: Sources/target/classes/templates/register.html
===================================================================
--- Sources/target/classes/templates/register.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/register.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,40 @@
+<div class="container">
+    <h1 th:text="${error?.toString()}"></h1>
+</div>
+<div class="container">
+    <form class="form-signin mt-xl-5" method="post" action="/register">
+        <h2 class="form-signin-heading">Register</h2>
+        <p>
+            <label for="email" class="sr-only">Емаил</label>
+            <input type="text" id="email" name="email" class="form-control" placeholder="Емаил" required=""
+                   autofocus="">
+        </p>
+        <p>
+            <label for="username" class="sr-only">Корисничко име</label>
+            <input type="text" id="username" name="username" class="form-control" placeholder="Корисничко име" required=""
+                   autofocus="">
+        </p>
+        <p>
+            <label for="password" class="sr-only">Лозинка</label>
+            <input type="password" id="password" name="password" class="form-control" placeholder="Лозинка"
+                   required="">
+        </p>
+        <p>
+            <label for="repeatedPassword" class="sr-only">Потврди лозинка</label>
+            <input type="password" id="repeatedPassword" name="repeatedPassword" class="form-control"
+                   placeholder="Потврди лозинка" required="">
+        </p>
+        <p>
+            <label for="name" class="sr-only">Име</label>
+            <input type="text" id="name" name="name" class="form-control" placeholder="Име" required="" autofocus="">
+        </p>
+        <p>
+            <label for="surname" class="sr-only">Презиме</label>
+            <input type="text" id="surname" name="surname" class="form-control" placeholder="Презиме" required=""
+                   autofocus="">
+        </p>
+
+        <button class="btn btn-lg btn-primary btn-block" type="submit">Регистрирај се</button>
+    </form>
+    <a href="/login" class="btn btn-block btn-light">Најави се</a>
+</div>
Index: Sources/target/classes/templates/repliesAdd.html
===================================================================
--- Sources/target/classes/templates/repliesAdd.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/repliesAdd.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,38 @@
+<main xmlns:th="http://www.thymeleaf.org">
+
+    <div class="container">
+        <div class="row">
+            <div class="col-md-5">
+                <form th:action="@{'/replies/save/{replyId}' (replyId = ${reply?.getReplyId()})}" method="POST">
+
+                    <div class="form-group">
+                        <label for="text">Опис</label>
+                        <input type="text"
+                               class="form-control"
+                               id="text"
+                               name="text"
+                               th:value="${reply?.getText()}"
+                               multiple
+                               placeholder="Опис">
+                    </div>
+                    <input type="hidden"
+                            id="discussionId"
+                           name="discussionId"
+                           th:value="${reply != null ? reply.getDiscussionId() : discussionId}"
+                    >
+
+
+
+
+
+
+
+                    <button id="submit" type="submit" class="btn btn-primary">Submit</button>
+                    <a type="button" class="btn btn-primary" th:href="@{/discussions}">Back</a>
+                </form>
+            </div>
+        </div>
+    </div>
+
+
+</main>
Index: Sources/target/classes/templates/template.html
===================================================================
--- Sources/target/classes/templates/template.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/template.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+    <title>weDiscussMovies</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+    <script type="text/javascript" th:src="@{/js/sharedScript.js}" src=""></script>
+    <script src="https://code.jquery.com/jquery-3.6.0.js"></script>
+    <script src="https://code.jquery.com/ui/1.13.0/jquery-ui.js"></script>
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.13.0/themes/base/jquery-ui.css">
+
+    <link rel="stylesheet" th:href="@{/css/shared.css}" >
+</head>
+<body>
+<a href="/movies">
+
+    <section class="jumbotron text-center" style="background: url('/img/cover.jpg') center; background-repeat: no-repeat; background-size: 100% auto; height: 280px; margin-bottom: 0px ">
+        <div class="container" >
+            <h1 class="jumbotron-heading" style="z-index: -1"></h1>
+        </div>
+    </section>
+</a>
+
+<header th:replace="fragments/header"></header>
+<div class="container md-4">
+    <h1 class="danger" th:text="${error?.toString()}"></h1>
+</div>
+<section th:include="${contentTemplate}"></section>
+<div id="dialog-rating" style="display: none">
+    <label for="reason">Причина</label><textarea id="reason"></textarea>
+    <label for="grade">Рејтинг</label><input type="number" id="grade" max="10" min="5">
+</div>
+</body>
+</html>
+
+
Index: Sources/target/classes/templates/usersShow.html
===================================================================
--- Sources/target/classes/templates/usersShow.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ Sources/target/classes/templates/usersShow.html	(revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
@@ -0,0 +1,83 @@
+
+<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+    <div style="width: 70%; margin: auto">
+        <h1 th:text="${user.getName() + ' ' + user.getSurname()}" style="text-align: center; padding:10px; background-color: rgba(64,64,64,0.5); color:white; border-radius: 10px 0px"></h1>
+        <hr>
+        <div style="width: 80%; margin: auto">
+            <h3>
+                <span>Е-маил:</span>
+                <span th:text="${user.getEmail()}"></span>
+            </h3>
+            <h3>
+                <span>Корисничко име:</span>
+                <span th:text="${user.getUsername()}"></span>
+            </h3>
+        </div>
+    </div>
+    <div style="width: 60%; margin:auto">
+        <div class="user-movies-list genres-listing hidden-class" style="width: 45%;float: left">
+            <h3>Жанрови кои му се допаднале на корисникот:</h3>
+            <ul>
+                <li th:each="genre: ${user.getUserGenres()}" th:text="${genre.getGenre().getGenreType()}"></li>
+            </ul>
+        </div>
+        <div class="user-movies-list genres-listing hidden-class" style="width: 45%;float: left">
+            <h3>Филмови кои му се допаднале на корисникот:</h3>
+            <ul>
+                <div th:each="movie: ${user.getMovieLikes()}">
+                    <a th:href="@{'/movies/{id}' (id=${movie.getMovie().getMovieId()})}">
+                        <li th:text="${movie.getMovie().getTitle()}"></li>
+                    </a>
+                </div>
+            </ul>
+        </div>
+    </div>
+    <div style="width: 60%; margin: auto">
+        <div class="user-movies-list hidden-class" style="width: 45%;float: left">
+            <h3>Актери и Режисери на кои корисникот им дал оцена:</h3>
+            <ul>
+                <li th:each="person: ${user.getPersonRates()}">
+                    <a th:text="${person.getPerson().getName() + ' ' + person.getPerson().getSurname()}" th:href="@{'/persons/{id}' (id=${person.getPerson().getPersonId()})}" class="rate-title"></a>
+                    <hr>
+                    <h4 th:text="${person.getStarsRated() + '/10'}"></h4>
+                    <br>
+                    <p th:text="${person.getReason()}" class="user-text"></p>
+                </li>
+            </ul>
+        </div>
+        <div class="user-movies-list hidden-class" style="width: 45%;float: left">
+            <h3>Филмови на кои корисникот им дал оцена:</h3>
+            <ul>
+                <li th:each="movieRates: ${user.getMovieRates()}">
+                    <a th:text="${movieRates.getMovie().getTitle() }" th:href="@{'/movies/{id}' (id=${movieRates.getMovie().getMovieId()})}" class="rate-title"></a>
+                    <hr>
+                    <h4 th:text="${movieRates.getStarsRated() + '/10'}"></h4>
+                    <br>
+                    <p th:text="${movieRates.getReason()}" class="user-text"></p>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div style="width: 60%; margin: auto">
+        <div class="user-movies-list hidden-class" style="width: 45%;float: left">
+            <h3>Дискусии од корисникот:</h3>
+            <ul>
+                <li th:each="discussion: ${user.getDiscussions()}">
+                    <a th:text="${discussion.getTitle() }" th:href="@{'/discussions/{id}' (id=${discussion.getDiscussionId()})}" class="rate-title"></a>
+                    <hr>
+                    <p th:text="${discussion.getText()}" class="user-text-small"></p>
+                </li>
+            </ul>
+        </div>
+        <div class="user-movies-list hidden-class" style="width: 45%;float: left">
+            <h3>Реплики од корисникот:</h3>
+            <ul>
+                <li th:each="reply: ${user.getReplies()}">
+                    <a th:text="${reply.getDiscussion().getTitle() }" th:href="@{'/discussions/{id}' (id=${reply.getDiscussion().getDiscussionId()})}" class="rate-title"></a>
+                    <hr>
+                    <p th:text="${reply.getText()}" class="user-text-small"></p>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
