diff --git a/resources/js/app.js b/resources/js/app.js
index 9f52a119..6856b951 100755
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -145,7 +145,7 @@ const router = new VueRouter({
         { path: '/login', component: LoginForm },
         { path: '/admin', component: AdminLayout },
         { path: '/media-player', component: MediaPlayer },
-        { path: '/books', component: Books },
+        { path: '/books/:bookId?', component: Books },
         { path: '/chapters/read/:chapterId', component: TextReader },
         { path: '/flashcards', component: FlashcardCollectionList },
         { path: '/flashcards/edit/:flashcardCollectionId?', component: FlashcardCollection },
diff --git a/resources/js/components/Home/PatchNotes.vue b/resources/js/components/Home/PatchNotes.vue
index c878d0aa..abb1be25 100644
--- a/resources/js/components/Home/PatchNotes.vue
+++ b/resources/js/components/Home/PatchNotes.vue
@@ -15,16 +15,27 @@
                     <li>
                         Added hotkeys for the text reader and review pages.
                     </li>
+                    <li>
+                        Added proper finish reading screen.
+                    </li>
                 </ul>
+                
                 <b>Bug fixes:</b>
                 <ul>
                     <li>
-                        Users clicking anywhere outside of the vocabulary box will close the vocabulary box. Previously it only worked if the user clicked on empty space inside the text box.
+                        Users clicking anywhere outside of the vocabulary box will close the vocabulary box. Previously it only worked if the user clicked on an empty space inside the text box.
                     </li>
                     <li>
                         Increased maximum execution time for importing dictionaries. If your dictionary import did not end with a success message but still functional, I recommend importing it again, because it probably did not import all the records from the dictionary file.
                     </li>
                 </ul>
+                
+                <b>Other changes:</b>
+                <ul>
+                    <li>
+                        Updated node.js to v20.11.0.
+                    </li>
+                </ul>
             </v-card-text>
         </v-card>
 
diff --git a/resources/js/components/Library/Books.vue b/resources/js/components/Library/Books.vue
index 548f9aa1..aaeef8db 100644
--- a/resources/js/components/Library/Books.vue
+++ b/resources/js/components/Library/Books.vue
@@ -320,14 +320,24 @@
                 for (let bookIndex = 0; bookIndex < this.books.length; bookIndex ++) {
                     if (bookId !== this.books[bookIndex].id) {
                         this.books[bookIndex].chaptersVisible = false;
+                        
                     } else {
                         this.anyChapterVisible = !this.books[bookIndex].chaptersVisible;
                         this.books[bookIndex].chaptersVisible = !this.books[bookIndex].chaptersVisible;
+
                         setTimeout(() => {
                             document.getElementById('book-' + bookId).scrollIntoView();
                         }, 500);
                     }
                 }
+
+                if (this.anyChapterVisible && this.$router.currentRoute.fullPath !== ('/books/' + bookId)) {
+                    this.$router.push('/books/' + bookId);
+                }
+
+                if (!this.anyChapterVisible && this.$router.currentRoute.fullPath !== ('/books')) {
+                    this.$router.push('/books');
+                }
             },
             showStartReviewDialog(bookId, bookName) {
                 this.startReviewDialog.bookName = bookName;
@@ -347,6 +357,10 @@
                     }
 
                     this.books = response.data;
+
+                    if (this.$route.params.bookId !== undefined) {
+                        this.toggleChapters(parseInt(this.$route.params.bookId));
+                    }
                 });
             },
             formatNumber: formatNumber
diff --git a/resources/js/components/Text/TextBlockGroup.vue b/resources/js/components/Text/TextBlockGroup.vue
index 9e991d9c..bb07c7ef 100644
--- a/resources/js/components/Text/TextBlockGroup.vue
+++ b/resources/js/components/Text/TextBlockGroup.vue
@@ -107,7 +107,7 @@
 
         <!--Vocabulary sidebar-->
         <vocabulary-side-box
-            v-if="$props.vocabularySidebarFits && $props.vocabularySidebar"
+            v-if="$props.vocabularySidebarFits && $props.vocabularySidebar && !modernVocabBox.sidebarHidden"
             :key="'vocabulary-side-box-' + modernVocabBox.key"
             ref="vocabularySideBox"
             :language="$props.language"
@@ -147,6 +147,13 @@
                 ankiShowNotifications: false,
                 textBlocks: this.$props._textBlocks,
                 modernVocabBox: {
+                    /*
+                        Keep the sidebar hidden until the first position
+                        update, so it won't jump around on the screen when
+                        a text is opened.
+                    */
+                    sidebarHidden: true,
+
                     key: 0,
                     active: false,
                     // word, new phrase, existing phrase
@@ -263,7 +270,6 @@
         },
         methods: {
             hotkeyHandle(event) {
-                console.log(event.which);
                 if (!this.$props.hotkeysEnabled) {
                     return;
                 }
@@ -285,7 +291,9 @@
                     // set stage to ignore
                     case 88:
                         event.preventDefault();
-                        this.setStage(1);
+                        if (this.selection.length == 1) {
+                            this.setStage(1);
+                        }
                         break;
 
                     // increase font size
@@ -303,7 +311,7 @@
                         break;
 
                     // add selected word to anki
-                    case 82:
+                    case 70:
                         event.preventDefault();
                         this.addSelectedWordToAnki();
                         break;
@@ -336,8 +344,6 @@
                     var currentWordIndex = this.selection[0].wordIndex;
                 }
 
-                
-                console.log('prev. current:', currentWordIndex);
                 var wordToSelect = -1;
                 var selectedTextBlock = this.selectedTextBlock === -1 ? 0 : this.selectedTextBlock;
 
@@ -394,8 +400,6 @@
                     var currentWordIndex = this.selection[this.selection.length - 1].wordIndex;
                 }
 
-                
-                console.log('prev. current:', currentWordIndex);
                 var wordToSelect = -1;
                 var selectedTextBlock = this.selectedTextBlock === -1 ? 0 : this.selectedTextBlock;
 
@@ -1078,6 +1082,7 @@
 
                 // update sidebar
                 if (this.$props.vocabularySidebarFits && this.$props.vocabularySidebar) {
+                    this.modernVocabBox.sidebarHidden = false;
                     this.modernVocabBox.height = vocabBoxAreaElement.offsetHeight;
                     this.modernVocabBox.positionLeft = vocabBoxArea.right;
                     this.modernVocabBox.positionTop = vocabBoxArea.top;
diff --git a/resources/js/components/Text/VocabularyBox.vue b/resources/js/components/Text/VocabularyBox.vue
index 7e7e9666..1bc894e1 100644
--- a/resources/js/components/Text/VocabularyBox.vue
+++ b/resources/js/components/Text/VocabularyBox.vue
@@ -169,6 +169,7 @@
                             height="100"
                             v-model="translationText"
                             @change="inputChanged"
+                            @keydown.stop=";"
                         ></v-textarea>
 
                         <!-- Search box -->
@@ -211,6 +212,7 @@
                                 rounded
                                 v-model="baseWord"
                                 @change="inputChanged"
+                                @keydown.stop=";"
                             ></v-text-field>
                             <v-text-field 
                                 :class="{'mt-2': true, 'mb-2': ($props.language !== 'japanese' && $props.language !== 'chinese')}"
@@ -222,6 +224,7 @@
                                 rounded
                                 :value="word"
                                 @change="inputChanged"
+                                @keydown.stop=";"
                             ></v-text-field>
                         </div>
 
@@ -236,6 +239,7 @@
                                 rounded
                                 v-model="baseWordReading"
                                 @change="inputChanged"
+                                @keydown.stop=";"
                             ></v-text-field>
                             <v-text-field 
                                 class="my-2"
@@ -246,6 +250,7 @@
                                 rounded
                                 v-model="reading"
                                 @change="inputChanged"
+                                @keydown.stop=";"
                             ></v-text-field>
                         </div>
 
@@ -262,6 +267,7 @@
                             height="100"
                             v-model="reading"
                             @change="inputChanged"
+                            @keydown.stop=";"
                         ></v-textarea>
                     </v-card-text>
                 </v-tab-item>
diff --git a/resources/js/components/Text/VocabularySearchBox.vue b/resources/js/components/Text/VocabularySearchBox.vue
index 268d3d99..8fef3b55 100644
--- a/resources/js/components/Text/VocabularySearchBox.vue
+++ b/resources/js/components/Text/VocabularySearchBox.vue
@@ -10,6 +10,7 @@
             hide-details
             v-model="searchField"
             @change="makeSearchRequest"
+            @keydown.stop=";"
         ></v-text-field>
 
         <!-- Search results -->
diff --git a/resources/js/components/Text/VocabularySideBox.vue b/resources/js/components/Text/VocabularySideBox.vue
index e0b190c2..ff28a233 100644
--- a/resources/js/components/Text/VocabularySideBox.vue
+++ b/resources/js/components/Text/VocabularySideBox.vue
@@ -58,6 +58,7 @@
                     rounded
                     v-model="baseWord"
                     @change="inputChanged"
+                    @keydown.stop=";"
                 ></v-text-field>
                 <v-icon class="mt-1 mx-1">mdi-arrow-right</v-icon>
                 <v-text-field 
@@ -70,6 +71,7 @@
                     rounded
                     :value="word"
                     @change="inputChanged"
+                    @keydown.stop=";"
                 ></v-text-field>
             </div>
 
@@ -84,6 +86,7 @@
                     rounded
                     v-model="baseWordReading"
                     @change="inputChanged"
+                    @keydown.stop=";"
                 ></v-text-field>
                 <v-icon class="mt-1 mx-1">mdi-arrow-right</v-icon>
                 <v-text-field 
@@ -95,6 +98,7 @@
                     rounded
                     v-model="reading"
                     @change="inputChanged"
+                    @keydown.stop=";"
                 ></v-text-field>
             </div>
 
@@ -111,6 +115,7 @@
                 height="80"
                 disabled
                 :value="phraseText"
+                @keydown.stop=";"
             ></v-textarea>
 
             <!-- Phrase reading -->
@@ -126,6 +131,7 @@
                 height="80"
                 v-model="reading"
                 @change="inputChanged"
+                @keydown.stop=";"
             ></v-textarea>
             
             <!-- Stage buttons-->
@@ -190,6 +196,7 @@
                 height="100"
                 v-model="translationText"
                 @change="inputChanged"
+                @keydown.stop=";"
             ></v-textarea>
         </div>
 
@@ -316,7 +323,6 @@
                 this.$emit('unselectAllWords');
             },
             addSelectedWordToAnki() {
-                console.log('sending to anki');
                 this.$emit('addSelectedWordToAnki');
             },
             close() {
diff --git a/resources/js/components/TextReader/TextReader.vue b/resources/js/components/TextReader/TextReader.vue
index 93055499..6c090cb9 100644
--- a/resources/js/components/TextReader/TextReader.vue
+++ b/resources/js/components/TextReader/TextReader.vue
@@ -124,46 +124,58 @@
                 </v-card-text>
             </v-card>&nbsp;
             
-            <!-- Finish -->
-            <div v-if="finished" id="finished-box">
-                <div id="lesson-finished-text">Congratulations! You have finished {{ lessonName }}!</div>
+            <!-- Finish box -->
+            <v-card 
+                v-if="finished" 
+                outlined 
+                id="finished-box"
+                class="rounded-lg mx-auto"
+                width="500px"
+            >
+                <!-- Title -->
+                <v-card-title><v-icon large color="success" class="mr-1">mdi-bookmark-check</v-icon>Congratulations!</v-card-title>
+                
+                <!-- Text -->
+                <v-card-text>
+                    You have finished reading this chapter: <b>{{ lessonName }}</b>, and you have read <b>{{ formatNumber(wordCount) }}</b> words. Keep up the good work, and your 
+                    <span class="text-capitalize">{{ language }}</span> skills will improve steadily. Consistency is key!
 
-                <table id="finished-stats" class="table-sm table-bordered">
-                    <thead>
-                        <tr>
-                            <th scope="col">Word type</th>
-                            <th scope="col">Amount</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td>Read words:</td>
-                            <td> {{ wordCount }} </td>
-                        </tr>
-                        <tr>
-                            <td>Newly saved words:</td>
-                            <td> {{ newlySavedWords }} </td>
-                        </tr>
-                        <tr>
-                            <td>Learned words:</td>
-                            <td> {{ learnedWords }} </td>
-                        </tr>
-                        <tr>
-                            <td>Progressed words:</td>
-                            <td> {{ progressedWords }} </td>
-                        </tr>
-                    </tbody>
-                </table>
-                <div class="text-center">
-                    <v-btn depressed :small="$vuetify.breakpoint.xsOnly" color="primary" :to="'/chapters/' + bookId">Go to lessons</v-btn>
-                    <v-btn depressed :small="$vuetify.breakpoint.xsOnly" color="primary" :to="'/chapters/read/' + nextLesson" v-if="nextLesson !== -1">Go to next lesson</v-btn>
-                </div>
-            </div>
+                    <template v-if="nextLesson === -1">
+                        <br><br>
+                        This was the last chapter in this book.
+                    </template>
+                </v-card-text>
+                
+                <!-- Actions -->
+                <v-card-actions>
+                    <v-spacer />
+                    <v-btn 
+                        rounded 
+                        depressed 
+                        color="primary" 
+                        @click="$router.push('/books/' + bookId)"
+                    >
+                        <v-icon class="mr-1">mdi-book-open-variant</v-icon>
+                        Library
+                    </v-btn>
+                    <v-btn 
+                        v-if="nextLesson !== -1"
+                        rounded 
+                        depressed 
+                        color="primary" 
+                        :to="'/chapters/read/' + nextLesson" 
+                    >
+                        <v-icon class="mr-1">mdi-page-next-outline</v-icon>
+                        Next chapter
+                    </v-btn>
+                </v-card-actions>
+            </v-card>
         </div>
     </div>
 </template>
 
 <script>
+    import {formatNumber} from './../../helper.js';
     export default {
         data: function() {
             return {
@@ -247,7 +259,7 @@
                 window.addEventListener('scroll', this.updateToolbarPosition);
                 document.getElementById('fullscreen-box').addEventListener('fullscreenchange', this.updateFullscreen);
                 for (let i = 0; i < this.lessons.length; i++) {
-                    if (this.lessons[i].id == this.lessonId && i < this.lessons.length - 1 && this.lessons[i + 1].read_count) {
+                    if (this.lessons[i].id == this.lessonId && i < this.lessons.length - 1) {
                         this.nextLesson = this.lessons[i + 1].id;
                         break;
                     }
@@ -382,7 +394,8 @@
                 }).catch(function (error) {
                     console.log(error);
                 });
-            }
+            },
+            formatNumber: formatNumber
         }
     }
 </script>
diff --git a/resources/js/components/TextReader/TextReaderHotkeyInformationDialog.vue b/resources/js/components/TextReader/TextReaderHotkeyInformationDialog.vue
index e270336c..e8becee9 100644
--- a/resources/js/components/TextReader/TextReaderHotkeyInformationDialog.vue
+++ b/resources/js/components/TextReader/TextReaderHotkeyInformationDialog.vue
@@ -52,7 +52,7 @@
                     <span class="primary--text" style="width: 170px;">s</span><span>Decrease font size</span>
                 </div>
                 <div class="hotkey d-flex">
-                    <span class="primary--text" style="width: 170px;">r</span><span>Send word or phrase to anki</span>
+                    <span class="primary--text" style="width: 170px;">f</span><span>Send word or phrase to anki</span>
                 </div>
                 <div class="hotkey d-flex">
                     <span class="primary--text" style="width: 170px;">Esc</span><span>Unselect word or phrase</span>
diff --git a/resources/sass/TextReader/TextReader.scss b/resources/sass/TextReader/TextReader.scss
index c223bbd1..012932ae 100644
--- a/resources/sass/TextReader/TextReader.scss
+++ b/resources/sass/TextReader/TextReader.scss
@@ -105,8 +105,6 @@
 }
 
 #finished-box {
-    display: block;
-    height: calc(100% - 53px);
 
     #lesson-finished-text {
         width: 100%;
diff --git a/routes/web.php b/routes/web.php
index 2f448a71..94b419dd 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -41,7 +41,7 @@
     Route::get('/patch-notes', [App\Http\Controllers\HomeController::class, 'index']);
     Route::get('/admin', [App\Http\Controllers\HomeController::class, 'index']);
     Route::get('/media-player', [App\Http\Controllers\HomeController::class, 'index']);
-    Route::get('/books', [App\Http\Controllers\HomeController::class, 'index']);
+    Route::get('/books/{bookId?}', [App\Http\Controllers\HomeController::class, 'index']);
     Route::get('/book/create', [App\Http\Controllers\HomeController::class, 'index']);
     Route::get('/chapters/{id}', [App\Http\Controllers\HomeController::class, 'index']);
     Route::get('/chapters/read/{id}', [App\Http\Controllers\HomeController::class, 'index']);