diff --git a/public/css/mango.css b/public/css/mango.css
index 6832486..6f77a95 100644
--- a/public/css/mango.css
+++ b/public/css/mango.css
@@ -17,3 +17,6 @@
 #scan-status {
 	cursor: auto;
 }
+.uk-card-title {
+	word-wrap: break-word;
+}
diff --git a/src/library.cr b/src/library.cr
index 9c43782..176772a 100644
--- a/src/library.cr
+++ b/src/library.cr
@@ -18,7 +18,7 @@ class Entry
 
 	def initialize(path, @book_title)
 		@zip_path = path
-		@title = File.basename path, ".zip"
+		@title = File.basename path, File.extname path
 		@size = (File.size path).humanize_bytes
 		@pages = Zip::File.new(path).entries
 			.select { |e|
@@ -57,7 +57,7 @@ class Title
 		@dir = dir
 		@title = File.basename dir
 		@entries = (Dir.entries dir)
-			.select { |path| (File.extname path) == ".zip" }
+			.select { |path| [".zip", ".cbz"].includes? File.extname path }
 			.map { |path| Entry.new File.join(dir, path), @title }
 			.select { |e| e.pages > 0 }
 			.sort { |a, b| a.title <=> b.title }