diff --git a/src/main/java/ru/redrise/marinesco/RootController.java b/src/main/java/ru/redrise/marinesco/RootController.java
index db3ba4d..b817113 100644
--- a/src/main/java/ru/redrise/marinesco/RootController.java
+++ b/src/main/java/ru/redrise/marinesco/RootController.java
@@ -5,17 +5,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 @Controller
 @RequestMapping("/")
 public class RootController {
 
     @GetMapping
     public String getPage(@ModelAttribute("search") String text) {
-        // TODO: SEARCH PAGE + CONTROLLER
-        log.info(text);
         return "root";
     }
 }
diff --git a/src/main/java/ru/redrise/marinesco/AuthorController.java b/src/main/java/ru/redrise/marinesco/library/AuthorController.java
similarity index 91%
rename from src/main/java/ru/redrise/marinesco/AuthorController.java
rename to src/main/java/ru/redrise/marinesco/library/AuthorController.java
index b033fdd..0c30f07 100644
--- a/src/main/java/ru/redrise/marinesco/AuthorController.java
+++ b/src/main/java/ru/redrise/marinesco/library/AuthorController.java
@@ -1,4 +1,4 @@
-package ru.redrise.marinesco;
+package ru.redrise.marinesco.library;
 
 import java.util.List;
 
@@ -10,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import ru.redrise.marinesco.data.AuthorRepository;
 import ru.redrise.marinesco.data.BookRepository;
-import ru.redrise.marinesco.library.Author;
-import ru.redrise.marinesco.library.Book;
 
 @Controller
 @RequestMapping("/author")
diff --git a/src/main/java/ru/redrise/marinesco/BookController.java b/src/main/java/ru/redrise/marinesco/library/BookController.java
similarity index 92%
rename from src/main/java/ru/redrise/marinesco/BookController.java
rename to src/main/java/ru/redrise/marinesco/library/BookController.java
index b73007d..cd5182c 100644
--- a/src/main/java/ru/redrise/marinesco/BookController.java
+++ b/src/main/java/ru/redrise/marinesco/library/BookController.java
@@ -1,4 +1,4 @@
-package ru.redrise.marinesco;
+package ru.redrise.marinesco.library;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import ru.redrise.marinesco.data.BookRepository;
-import ru.redrise.marinesco.library.Book;
 
 @Controller
 @RequestMapping("/book")
diff --git a/src/main/java/ru/redrise/marinesco/library/InpxScanner.java b/src/main/java/ru/redrise/marinesco/library/InpxScanner.java
index 158a593..479fbde 100644
--- a/src/main/java/ru/redrise/marinesco/library/InpxScanner.java
+++ b/src/main/java/ru/redrise/marinesco/library/InpxScanner.java
@@ -134,22 +134,23 @@ public class InpxScanner implements Runnable {
     }
 
     private void parseInp(File inpxFile) throws Exception {
+        /*
         log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
         log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
         log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
         boolean breaker = false;
-
+        */
         try (ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(inpxFile))) {
             ZipEntry zipEntry = zipInputStream.getNextEntry();
 
             while (zipEntry != null) {
                 if (zipEntry.getName().toLowerCase().endsWith(".inp")) {
-                    // *
+                    /*
                     if (breaker) {
                         zipEntry = zipInputStream.getNextEntry();
                         continue;
                     }
-                    breaker = true;//
+                    breaker = true;
                     // */
                     byte[] content = inpToByteArray(zipInputStream, zipEntry.getSize());
                     parseInpContent(content, zipEntry.getName());
diff --git a/src/main/resources/static/styles/styles.css b/src/main/resources/static/styles/styles.css
index 51619ae..bad83d7 100644
--- a/src/main/resources/static/styles/styles.css
+++ b/src/main/resources/static/styles/styles.css
@@ -156,12 +156,11 @@ header {
 	color: #74bfbd;
 }
 
-.header_entry_link:link {
-	color: #74bfbd;
-}
+.header_entry_link:link,
 .header_entry_link:visited {
 	color: #74bfbd;
 }
+
 .header_entry_link:hover {
 	color: #b6a795;
 }
@@ -175,10 +174,6 @@ header {
 	margin-right: 10px;
 }
 
-a.entry {
-	text-decoration: none;
-}
-
 .header_title {
 	font-size: 1.5em;
 }
@@ -262,9 +257,6 @@ button:hover {
 	text-shadow: -1px -1px 0 #1e1e1e, 1px -1px 0 #1e1e1e, -1px 1px 0 #1e1e1e, 1px 1px 0 #1e1e1e;
 	color: #74bfbd;
 }
-.copy_link:hover {
-	color: #b6a795;
-}
 
 /* error */
 .error {
diff --git a/src/main/resources/templates/book.html b/src/main/resources/templates/book.html
index 9176248..7aa1415 100644
--- a/src/main/resources/templates/book.html
+++ b/src/main/resources/templates/book.html
@@ -21,7 +21,7 @@
                     <a th:href="${'/author/' + author.id}" th:text="${author.authorName}"></a>
                 </div>
                 <br />
-                <span th:each="genre : ${book.genres}" th:text="${(genre.humanReadableDescription == '' ? genre.genreId : genre.humanReadableDescription) + '&nbsp;&nbsp;'}"></span>
+                <span th:each="genre : ${book.genres}" th:text="${((genre.humanReadableDescription == null || genre.humanReadableDescription == '') ? genre.genreId : genre.humanReadableDescription) + '&nbsp;&nbsp;'}"></span>
                 <p>
                     <a th:href="${'/download/?container=' + book.container + '&file=' + book.fsFileName}" 
                         th:text="${'Download ' + book.fileExtension + ' (' + book.fileSizeForHumans + ')'}"></a>
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
index 2e2bd23..62ebc0d 100644
--- a/src/main/resources/templates/fragments/footer.html
+++ b/src/main/resources/templates/fragments/footer.html
@@ -7,10 +7,8 @@
 <body>
   <div class="footer" th:fragment="footer">
     <div class="container">
-      <footer class="inner_footer">
-        <a class="entry" href="https://redrise.ru">
-          <div class="copy_link">&copy; 2023-2024 Dmitry Isaenko</div>
-        </a>
+      <footer class="inner_footer copy_link">
+        <a class="header_entry_link" href="https://redrise.ru">&copy; 2023-2024 Dmitry Isaenko</a>
       </footer>
     </div>
   </div>
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
index b43c7bc..42f6fe2 100644
--- a/src/main/resources/templates/fragments/header.html
+++ b/src/main/resources/templates/fragments/header.html
@@ -14,9 +14,7 @@
           <div class="block_inner">
             <ul class="ul_right_block">
               <li class="li_header_block">
-                <a class="entry" href="/login" th:href="@{/login}">
-                  <span class="header_entry header_entry_link">Sign in</span>
-                </a>
+                <a class="header_entry header_entry_link" href="/login" th:href="@{/login}">Sign in</a>
               </li>
             </ul>
           </div>
@@ -53,9 +51,7 @@
                 <span class="header_entry">|</span>
               </li>
               <li class="li_header_block">
-                <a class="entry" href="/logout">
-                  <span class="header_entry header_entry_link">Logout</span>
-                </a>
+                <a class="header_entry header_entry_link" href="/logout">Logout</a>
                 <form style="visibility: hidden" id="form" method="post" action="#" th:action="@{/logout}"></form>
               </li>
             </ul>
diff --git a/src/main/resources/templates/root.html b/src/main/resources/templates/root.html
index 9409913..9cad69e 100644
--- a/src/main/resources/templates/root.html
+++ b/src/main/resources/templates/root.html
@@ -12,11 +12,7 @@
     <div class="page">
         <div th:replace="~{fragments/header :: ${#authorization.expression('isAuthenticated()')} ? 'header-auth' : 'header-anon'}"></div>
         <div class="container base">
-            <br /><a href="/book/59992766">/book/59992766</a>
-            <br /><a href="/author/1">/author/1</a>
-            <br /><a href="/h2">H2</a>
-            <br />
-            
+            Welcome
         </div>
     </div>
     <div th:replace="~{fragments/footer :: 'footer'}"></div>