diff --git a/src/view/chapter_view.c b/src/view/chapter_view.c
index 8d21d19..595b759 100644
--- a/src/view/chapter_view.c
+++ b/src/view/chapter_view.c
@@ -1,4 +1,5 @@
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
 
 #include <openmg/chapter.h>
 #include <openmg/view/chapter_view.h>
@@ -17,6 +18,30 @@ typedef struct {
     GListModel *pages; 
     GtkPicture *current_picture;
 } ChapterVisorData;
+
+static void
+image_page_show (GtkWidget *picture, gpointer user_data) {
+    GtkWidget *views_leaflet = GTK_WIDGET (user_data);
+    GdkPaintable *paintable = gtk_picture_get_paintable (GTK_PICTURE (picture));
+    double final_width = 0;
+    double final_height = 0;
+    guint width = gtk_widget_get_allocated_width
+            (views_leaflet);
+    gdk_paintable_compute_concrete_size (
+                paintable,
+                width,
+                0,
+                gdk_paintable_get_intrinsic_width (paintable),
+                gdk_paintable_get_intrinsic_height (paintable),
+                &final_width,
+                &final_height
+            );
+    g_object_set_property_int (G_OBJECT (picture),
+            "width-request", (int) final_width);
+    g_object_set_property_int (G_OBJECT (picture),
+            "height-request", (int) final_height);
+}
+
 void
 setup_chapter_view (MgMangaChapter *chapter, AdwLeaflet *views_leaflet) {
     MgBackendReadmng *readmng = mg_backend_readmng_new ();
@@ -27,21 +52,27 @@ setup_chapter_view (MgMangaChapter *chapter, AdwLeaflet *views_leaflet) {
     GListModel *pages = mg_backend_readmng_get_chapter_images (readmng, chapter);
     ChapterVisorData *chapter_visor_data = g_malloc (sizeof *chapter_visor_data);
     GtkPicture *current_picture;
+    GtkButton *next_button = GTK_BUTTON (gtk_button_new_from_icon_name
+            ("go-next-symbolic"));
+    GtkButton *previous_button = GTK_BUTTON (gtk_button_new_from_icon_name
+            ("go-previous-symbolic"));
     chapter_visor_data->current_page = 0;
     chapter_visor_data->pages = pages;
     const char *url_image_not_owned =
-    gtk_string_list_get_string (GTK_STRING_LIST 
-                                     (pages), 0);
+        gtk_string_list_get_string (GTK_STRING_LIST 
+                (pages), 0);
     char *url_image = mg_util_string_alloc_string (string_util, strlen (url_image_not_owned));
     mg_util_string_copy_substring (string_util,
             url_image_not_owned, url_image,
             strlen(url_image_not_owned) + 1, 0,
             strlen (url_image_not_owned));
- 
+
     current_picture = create_picture_from_url
-        (url_image, 200);
-    g_object_set_property_int (G_OBJECT (current_picture), "vexpand", 1);
-    g_object_set_property_int (G_OBJECT (current_picture), "hexpand", 1);
+        (url_image, -1);
+    g_signal_connect (G_OBJECT (current_picture), "map",
+            G_CALLBACK (image_page_show), views_leaflet);
+    g_object_set_property_int (G_OBJECT (zoomable_picture_container), "hexpand", 1);
+    g_object_set_property_int (G_OBJECT (zoomable_picture_container), "vexpand", 1);
     chapter_visor_data->current_picture =
         current_picture;
     gtk_scrolled_window_set_child (zoomable_picture_container, GTK_WIDGET (current_picture));
@@ -52,6 +83,12 @@ setup_chapter_view (MgMangaChapter *chapter, AdwLeaflet *views_leaflet) {
     g_signal_connect (G_OBJECT (zoom_controller), "scale-changed", G_CALLBACK (fire_zoom), NULL);
 
     gtk_box_append (chapter_view_container, GTK_WIDGET (zoomable_picture_container));
+    GtkWidget *widget = adw_leaflet_get_adjacent_child
+        (views_leaflet, ADW_NAVIGATION_DIRECTION_FORWARD);
+    for (;widget;widget = adw_leaflet_get_adjacent_child
+            (views_leaflet, ADW_NAVIGATION_DIRECTION_FORWARD)) {
+        adw_leaflet_remove (views_leaflet, widget);
+    }
     adw_leaflet_append (views_leaflet, GTK_WIDGET (chapter_view_container));
     adw_leaflet_navigate (views_leaflet, ADW_NAVIGATION_DIRECTION_FORWARD);
 }