diff --git a/base.php b/base.php
index 654af50..dbf8d55 100644
--- a/base.php
+++ b/base.php
@@ -413,7 +413,8 @@ class PageBookDetail extends Page
 {
     public function InitializeContent () 
     {
-        $this->title = "Book";
+        $book = Book::getBookById ($this->idGet);
+        $this->title = $book->title;
     }
 }
 
diff --git a/book.php b/book.php
index 2e6112a..20e4dda 100644
--- a/book.php
+++ b/book.php
@@ -89,6 +89,19 @@ class Book extends Base {
         return self::ALL_BOOKS_ID.":letter:".$startingLetter;
     }
     
+    public function getUri () {
+        return "?page=".parent::PAGE_BOOK_DETAIL."&id=$this->id";
+    }
+    
+    public function getDetailUrl () {
+        global $config;
+        if ($config['cops_use_fancyapps'] == 0) { 
+            return 'index.php' . $this->getUri (); 
+        } else { 
+            return 'bookdetail.php?id=' . $this->id; 
+        }
+    }
+    
     public function getTitle () {
         return $this->title;
     }
diff --git a/bookdetail.php b/bookdetail.php
index ff55374..1edd2f3 100644
--- a/bookdetail.php
+++ b/bookdetail.php
@@ -23,7 +23,7 @@ $book->getLinkArray ();
             <?php
                 if ($book->hasCover) {
             ?>
-            <img src="fetch.php?id=<?php echo $book->id ?>&amp;height=150" alt="cover" />
+            <a href="fetch.php?id=<?php echo $book->id ?>"><img src="fetch.php?id=<?php echo $book->id ?>&amp;height=150" alt="cover" /></a>
             <?php
                 }
             ?>
@@ -38,7 +38,7 @@ $book->getLinkArray ();
             }
 ?>
         </div>
-        <div class="entryTitle"><?php echo htmlspecialchars ($book->title) ?></div>
+        <div class="entryTitle"><a rel="bookmark" href="<?php echo 'index.php' . $book->getUri () ?>"><img src="<?php echo getUrlWithVersion("images/Link.png") ?>" alt="permalink" /></a><?php echo htmlspecialchars ($book->title) ?></div>
         <div class="entrySection">
             <span><?php echo localize("authors.title") ?></span>
             <div class="buttonEffect pad6">
diff --git a/fetch.php b/fetch.php
index f6340ed..325a4c3 100644
--- a/fetch.php
+++ b/fetch.php
@@ -92,7 +92,10 @@
         $book->getUpdatedEpub ($idData);
         return;
     }
-    
-    header('Content-Disposition: attachment; filename="' . basename ($file) . '"');
+    if ($type == "jpg") {
+        header('Content-Disposition: filename="' . basename ($file) . '"');
+    } else {
+        header('Content-Disposition: attachment; filename="' . basename ($file) . '"');
+    }
     header ($config['cops_x_accel_redirect'] . ": " . $config['calibre_internal_directory'] . $file);
 ?>
\ No newline at end of file
diff --git a/images/Link.png b/images/Link.png
new file mode 100644
index 0000000..2a5278e
Binary files /dev/null and b/images/Link.png differ
diff --git a/index.php b/index.php
index 34e0651..0f97424 100644
--- a/index.php
+++ b/index.php
@@ -234,7 +234,7 @@
             ?>
             </div>
             <div class="bookdetail">
-                <a class="navigation" href="<?php if ($config['cops_use_fancyapps'] == 0) { echo 'index.php?page=13&amp;id=' . $entry->book->id; } else { echo 'bookdetail.php?id=' . $entry->book->id; } ?>" />
+                <a class="navigation" href="<?php echo $entry->book->getDetailUrl () ?>" />
                 <div class="entryTitle st"><?php echo htmlspecialchars ($entry->title) ?> <span class="sp">(<?php echo date ('Y', $entry->book->pubdate) ?>)</span> <span class="sr"><?php echo $entry->book->getRating () ?></span></div>
                 <div class="entryContent sa"><?php echo localize("authors.title") . " : " . htmlspecialchars ($entry->book->getAuthorsName ()) ?></div>
                 <div class="entryContent"><?php echo localize("tags.title") . " : " . htmlspecialchars ($entry->book->getTagsName ()) ?></div>