diff --git a/src/main/resources/templates/books.html b/src/main/resources/templates/books.html
index 0cc01c7..a144e54 100644
--- a/src/main/resources/templates/books.html
+++ b/src/main/resources/templates/books.html
@@ -42,179 +42,185 @@
     </div>
 </div>
 
-<div th:if="${lang != null}" class="callout info">
-    <p>
-        Фильтр по языку:
-        <span th:switch="${lang}">
-            <span th:case="0">Все языки</span>
-            <span th:case="1">Русский</span>
-            <span th:case="2">Английский</span>
-        </span>
-        <a th:href="@{/books}" class="button small">Сбросить фильтр</a>
-    </p>
-</div>
-<div layout:fragment="content">
-    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-        <h1 class="h2">
-            <span th:if="${genre}">Книги жанра: <span th:text="${genre.genre}">Жанр</span></span>
-            <span th:if="${author}">Книги автора: <span th:text="${author.fullName}">Автор</span></span>
-            <span th:if="${series}">Книги серии: <span th:text="${series.series}">Серия</span></span>
-<!--            <span th:if="${!genre && !author && !series}">Все книги</span>-->
-        </h1>
-        <div class="btn-toolbar mb-2 mb-md-0">
-            <div class="btn-group me-2">
-                <button type="button" class="btn btn-sm btn-outline-secondary" disabled>
-                    Всего: <span th:text="${books.totalElements}">0</span>
-                </button>
-            </div>
-        </div>
+<div th:fragment="body">
+    <script th:inline="javascript">
+        function del_bsbook(b_id, b_t) {
+            $('#DeleteBook_btnYes').attr("href",
+                /*[[@{/web/bsdel}]]*/ + '?book=' + b_id);
+            $('#DeleteBook_image').attr("src",
+                /*[[@{/opds/covertmpl}]]*/ + b_id + '/');
+            $('#DeleteBook_title').text(b_t);
+            $('#DeleteBookModal').foundation('open');
+        }
+    </script>
+
+    <!-- Модальное окно удаления книги -->
+    <div id="DeleteBookModal" class="reveal tiny text-center" data-reveal>
+        <h5 th:text="#{bookshelf.delete.confirm}">Confirm the deletion of the book to your bookshelf.</h5>
+        <table>
+            <tr>
+                <td width="100px" style="padding:0rem 0rem;">
+                    <img src="" id="DeleteBook_image" style="max-height: 100px; max-width: 100px">
+                </td>
+                <td style="font-size:100%; padding:3px">
+                    <p id="DeleteBook_title"></p>
+                </td>
+            </tr>
+        </table>
+        <p class="text-center">
+            <a href="#" class="secondary button" id="DeleteBook_btnYes" th:text="#{action.delete}">Delete</a>
+            &nbsp;&nbsp;&nbsp;
+            <a class="close button" data-close th:text="#{action.cancel}">Cancel</a>
+        </p>
+        <button class="close-button" data-close aria-label="Close modal" type="button">
+            <span aria-hidden="true">&times;</span>
+        </button>
     </div>
 
-    <!-- Фильтры -->
-    <div class="card mb-4">
-        <div class="card-body">
-            <form th:action="@{/books}" method="get" class="row g-3">
-                <div class="col-md-3">
-                    <label for="genre" class="form-label">Жанр</label>
-                    <select class="form-select" id="genre" name="genreId">
-                        <option value="">Все жанры</option>
-                        <option th:each="g : ${allGenres}"
-                                th:value="${g.id}"
-                                th:text="${g.genre}"
-                                th:selected="${genreId == g.id}">
-                        </option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="format" class="form-label">Формат</label>
-                    <select class="form-select" id="format" name="format">
-                        <option value="">Все форматы</option>
-                        <option th:each="f : ${formats}"
-                                th:value="${f}"
-                                th:text="${f}"
-                                th:selected="${format == f}">
-                        </option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="lang" class="form-label">Язык</label>
-                    <select class="form-select" id="lang" name="lang">
-                        <option value="">Все языки</option>
-                        <option value="ru">Русский</option>
-                        <option value="en">Английский</option>
-                    </select>
-                </div>
-                <div class="col-md-3 d-flex align-items-end">
-                    <button type="submit" class="btn btn-primary me-2">Применить</button>
-                    <a th:href="@{/books}" class="btn btn-outline-secondary">Сбросить</a>
-                </div>
-            </form>
+    <!-- Кнопка очистки полки -->
+    <div th:if="${isbookshelf}">
+        <div id="ConfirmModal" class="reveal tiny text-center" data-reveal>
+            <h5 th:text="#{bookshelf.clear.confirm}">Confirm to clear your bookshelf.</h5>
+            <p></p>
+            <p class="text-center">
+                <a th:href="@{/web/bsclear}" class="secondary button" th:text="#{action.clear}">Clear</a>
+                &nbsp;&nbsp;&nbsp;
+                <a class="close button" data-close th:text="#{action.cancel}">Cancel</a>
+            </p>
+            <button class="close-button" data-close aria-label="Close modal" type="button">
+                <span aria-hidden="true">&times;</span>
+            </button>
         </div>
+        <a class="alert button small" data-open="ConfirmModal" th:text="#{bookshelf.clear}">Clear bookshelf</a>
     </div>
 
     <!-- Список книг -->
-    <div class="row">
-        <div th:each="book : ${books.content}" class="col-md-6 mb-4">
-            <div class="card h-100">
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-3 text-center">
-                            <i class="bi bi-journal-bookmark" style="font-size: 4rem; color: #6c757d;"></i>
-                            <div class="mt-2">
-                                <span class="badge bg-secondary" th:text="${book.format}">format</span>
-                            </div>
-                        </div>
-                        <div class="col-9">
-                            <h5 class="card-title">
-                                <a th:href="@{/book/{id}(id=${book.id})}" th:text="${book.title}" class="text-decoration-none"></a>
-                            </h5>
+    <div th:each="b : ${books}">
+        <div class="large-12 column">
+            <b th:text="${b.title}">Book Title</b>
+            <i style="font-size:80%;" th:text="#{download}">Download:</i>
+            <i><a th:href="@{/opds/download/{id}/{type}(id=${b.id}, type=0)}">
+                <span class="label small" th:text="${b.format}">format</span>
+            </a></i>&nbsp;
 
-                            <p class="card-text" th:if="${book.authors}">
-                                <strong>Авторы:</strong>
-                                <span th:each="author, iter : ${book.authors}">
-                                        <a th:href="@{/books/author/{id}(id=${author.id})}" th:text="${author.fullName}" class="text-decoration-none"></a>
-                                        <span th:if="${not iter.last}">, </span>
-                                    </span>
-                            </p>
+            <i th:if="${!#lists.contains(nozip, b.format)}">
+                <a th:href="@{/opds/download/{id}/{type}(id=${b.id}, type=1)}">
+                    <span class="label small" th:text="${b.format + '+zip'}">format+zip</span>
+                </a>
+            </i>&nbsp;
 
-                            <p class="card-text" th:if="${book.series}">
-                                <strong>Серия:</strong>
-                                <a th:href="@{/books/series/{id}(id=${book.series.id})}" th:text="${book.series.series}" class="text-decoration-none"></a>
-                            </p>
+            <i th:if="${b.format == 'fb2' and fb2toepub}">
+                <a th:href="@{/opds/convert/{id}/{format}(id=${b.id}, format='epub')}">
+                    <span class="label small">epub</span>
+                </a>
+            </i>&nbsp;
 
-                            <p class="card-text" th:if="${book.genres}">
-                                <strong>Жанры:</strong>
-                                <span th:each="genre, iter : ${book.genres}">
-                                        <a th:href="@{/books/genre/{id}(id=${genre.id})}" th:text="${genre.genre}" class="text-decoration-none"></a>
-                                        <span th:if="${not iter.last}">, </span>
-                                    </span>
-                            </p>
+            <i th:if="${b.format == 'fb2' and fb2tomobi}">
+                <a th:href="@{/opds/convert/{id}/{format}(id=${b.id}, format='mobi')}">
+                    <span class="label small">mobi</span>
+                </a>
+            </i>&nbsp;
 
-                            <p class="card-text" th:if="${book.fileSize}">
-                                <small class="text-muted">
-                                    Размер: <span th:text="${#numbers.formatInteger(book.fileSize/1024/1024, 1, 'DEFAULT')}">0</span> MB
-                                </small>
-                            </p>
+            <span th:if="${isbookshelf}">
+                &nbsp;&nbsp;
+                <i><a href="#" th:onclick="'del_bsbook(' + ${b.id} + ',\'' + ${b.title} + '\');'">
+                    <span class="secondary label small" th:text="#{bookshelf.delete}">Delete from bookshelf</span>
+                </a></i>
+            </span>
+        </div>
 
-                            <p class="card-text" th:if="${book.lang}">
-                                <small class="text-muted">
-                                    Язык:
-                                    <span th:switch="${book.lang}">
-                                            <span th:case="'ru'">Русский</span>
-                                            <span th:case="'en'">Английский</span>
-                                            <span th:case="*" th:text="${book.lang}"></span>
-                                        </span>
-                                </small>
-                            </p>
-                        </div>
-                    </div>
-                </div>
-                <div class="card-footer">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <small class="text-muted" th:if="${book.registerDate}">
-                            Добавлено: <span th:text="${#temporals.format(book.registerDate, 'dd.MM.yyyy')}">дата</span>
-                        </small>
-                        <div>
-                            <a th:href="@{/book/{id}(id=${book.id})}" class="btn btn-sm btn-primary">Подробнее</a>
-                            <a th:if="${book.fileName}" th:href="@{/download/{id}(id=${book.id})}" class="btn btn-sm btn-outline-success">
-                                <i class="bi bi-download"></i> Скачать
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
+        <div class="large-12 column">
+            <table>
+                <tr>
+                    <td width="100px" style="padding:0rem 0rem;">
+                        <img th:src="@{/opds/thumb/{id}(id=${b.id})}" type="image/jpeg" width="80px">
+                    </td>
+                    <td style="font-size:80%; padding:1rem 1rem;">
+                        <b th:text="#{book.title}">Book title:</b> <span th:text="${b.title}">title</span><br>
+
+                        <span th:if="${#lists.size(b.authors) > 0}">
+                            <b th:text="#{authors}">Authors:</b>
+                            <th:block th:each="a, iter : ${b.authors}">
+                                <a th:href="@{/web/searchbooks(searchtype='a', searchterms=${a.id})}"
+                                   th:text="${a.fullName}">Author</a>
+                                <span th:if="${!iter.last}">,</span>
+                            </th:block><br>
+                        </span>
+
+                        <span th:if="${#lists.size(b.genres) > 0}">
+                            <b th:text="#{genres}">Genres:</b>
+                            <th:block th:each="g, iter : ${b.genres}">
+                                <a th:href="@{/web/searchbooks(searchtype='g', searchterms=${g.id})}"
+                                   th:text="${g.subsection}">Genre</a>
+                                <span th:if="${!iter.last}">,</span>
+                            </th:block><br>
+                        </span>
+
+                        <span th:if="${#lists.size(b.series) > 0}">
+                            <b th:text="#{series}">Series:</b>
+                            <th:block th:each="s, iter : ${b.series}">
+                                <a th:href="@{/web/searchbooks(searchtype='s', searchterms=${s.id})}"
+                                   th:text="${s.ser}">Series</a>
+                                <span th:if="${!iter.last}">,</span>
+                            </th:block><br>
+                            <b th:text="#{series.number}">No in Series:</b>
+                            <th:block th:each="sn, iter : ${b.serNo}">
+                                <span th:text="${sn.serNo}">1</span>
+                                <span th:if="${!iter.last}">,</span>
+                            </th:block><br>
+                        </span>
+
+                        <b th:text="#{file}">File:</b> <span th:text="${b.path + '/' + b.filename}">path</span><br>
+                        <b th:text="#{file.size}">File size:</b> <span th:text="${b.filesize + 'Кб.'}">size</span><br>
+                        <b th:text="#{changes.date}">Changes date:</b> <span th:text="${b.docdate}">date</span><br>
+
+                        <span th:if="${b.doubles > 0}">
+                            <b th:text="#{doubles}">Doubles for book:</b>
+                            <a th:href="@{/web/searchbooks(searchtype='d', searchterms=${b.id})}">
+                                <span th:text="${b.title + ' (' + b.doubles + 'шт.)'}">title (count)</span>
+                            </a><br>
+                        </span>
+
+                        <span th:if="${b.readtime}">
+                            <b th:text="#{read.date}">Read date:</b>
+                            <span class="label small" th:text="${b.readtime[0].readtime}">read date</span><br>
+                        </span>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2">
+                        <p style="font-size:80%;" th:text="${b.annotation}">Annotation</p>
+                    </td>
+                </tr>
+            </table>
         </div>
     </div>
 
     <!-- Пагинация -->
-    <nav th:if="${books.totalPages > 1}" aria-label="Page navigation">
-        <ul class="pagination justify-content-center">
-            <li class="page-item" th:classappend="${books.first} ? 'disabled'">
-                <a class="page-link" th:href="@{${pageUrl}(page=0)}">Первая</a>
-            </li>
-            <li class="page-item" th:classappend="${books.first} ? 'disabled'">
-                <a class="page-link" th:href="@{${pageUrl}(page=${books.number - 1})}">Назад</a>
+    <div th:if="${paginator.numPages > 1}">
+        <ul class="pagination" role="navigation" aria-label="Pagination">
+            <li class="pagination-previous" th:classappend="${not paginator.hasPrevious} ? 'disabled' : ''">
+                <a th:if="${paginator.hasPrevious}"
+                   th:href="@{/web/searchbooks(searchtype=${searchtype}, searchterms=${searchterms}, page=${paginator.previousPageNumber})}"
+                   aria-label="Previous page" th:text="#{pagination.previous}">Previous page</a>
+                <span th:unless="${paginator.hasPrevious}" th:text="#{pagination.previous}">Previous page</span>
             </li>
 
-            <li th:each="page : ${#numbers.sequence(0, books.totalPages - 1)}"
-                class="page-item"
-                th:classappend="${page == books.number} ? 'active'">
-                <a class="page-link" th:href="@{${pageUrl}(page=${page})}" th:text="${page + 1}">1</a>
-            </li>
+            <th:block th:each="pn : ${paginator.pageRange}">
+                <li th:if="${paginator.number == pn}" class="current" th:text="${pn}">1</li>
+                <li th:unless="${paginator.number == pn}">
+                    <a th:href="@{/web/searchbooks(searchtype=${searchtype}, searchterms=${searchterms}, page=${pn})}"
+                       aria-label="Page ${pn}" th:text="${pn}">1</a>
+                </li>
+            </th:block>
 
-            <li class="page-item" th:classappend="${books.last} ? 'disabled'">
-                <a class="page-link" th:href="@{${pageUrl}(page=${books.number + 1})}">Вперед</a>
-            </li>
-            <li class="page-item" th:classappend="${books.last} ? 'disabled'">
-                <a class="page-link" th:href="@{${pageUrl}(page=${books.totalPages - 1})}">Последняя</a>
+            <li class="pagination-next" th:classappend="${not paginator.hasNext} ? 'disabled' : ''">
+                <a th:if="${paginator.hasNext}"
+                   th:href="@{/web/searchbooks(searchtype=${searchtype}, searchterms=${searchterms}, page=${paginator.nextPageNumber})}"
+                   aria-label="Next page" th:text="#{pagination.next}">Next page</a>
+                <span th:unless="${paginator.hasNext}" th:text="#{pagination.next}">Next page</span>
             </li>
         </ul>
-    </nav>
-
-    <div th:if="${books == null or books.content.empty}" class="text-center py-5">
-        <i class="bi bi-book" style="font-size: 4rem; color: #6c757d;"></i>
-        <h4 class="mt-3">Книги не найдены</h4>
-        <p class="text-muted">Попробуйте изменить параметры поиска или фильтры</p>
     </div>
 </div>