diff --git a/src/deps.mk b/src/deps.mk
index 2875dba..45f02a5 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -23,7 +23,5 @@ query.o: src/query.c src/client.h src/main.h src/types.h src/connection.h \
  src/ui/widget/../../common.h src/ui/widget/button.h \
  src/ui/widget/../../main.h src/ui/widget/group.h src/file_processor.h \
  src/server.h
-server.o: src/server.c src/client.h src/main.h src/types.h src/ui.h \
- src/ui/widget/file_list.h src/ui/widget/../widget.h \
- src/ui/widget/../../main.h
+server.o: src/server.c src/main.h src/types.h src/ui.h
 ui.o: src/ui.c
diff --git a/src/file_processor.c b/src/file_processor.c
index a717e14..d33ffff 100644
--- a/src/file_processor.c
+++ b/src/file_processor.c
@@ -20,7 +20,7 @@
 
 static void fl_add(fl_item_t **cur, fl_item_t **start, char *fname);
 static fl_item_t *fl_select(fl_item_t *start, int num);
-static void fl_clear(fl_item_t **start, fl_item_t **current);
+void fl_clear(fl_item_t **start, fl_item_t **current);
 
 static void clear_file_in_query(query_args_t *q_args);
 
@@ -30,10 +30,12 @@ void file_list(file_args_t *f_args, query_args_t *q_args) {
   static uint32_t idx = 1;
   static char qbuf[INBUFSIZE * 2];
   static uint32_t qbuf_used = 0;
-  file_list_t *fui = (file_list_t *) q_args->file_list_ui;
-  fui->start = f_args->l_start;
+  file_list_t *fui = (file_list_t *)q_args->file_list_ui;
+  fui->start = &(f_args->l_start);
+  fui->current = &(f_args->l_current);
 
-  if (qbuf_used == 0) qbuf[0] = 0;
+  if (qbuf_used == 0)
+    qbuf[0] = 0;
 
   while ((qlen = query_extract_from_buf(q_args->buf, &(q_args->buf_used),
                                         &query))) {
@@ -45,18 +47,29 @@ void file_list(file_args_t *f_args, query_args_t *q_args) {
     }
     strcat(qbuf, query);
     qbuf_used += strlen(qbuf);
-    if (strchr(qbuf, '\n') == NULL) continue;
+    if (strchr(qbuf, '\n') == NULL)
+      continue;
     fl_add(&(f_args->l_current), &(f_args->l_start), qbuf);
-    fui->count++;
+    fui->current_count++;
     free(query);
     query = NULL;
     qbuf_used = 0;
     qbuf[0] = 0;
   }
 
+  uint32_t current_page, pages, current_count, full_count;
+
   while ((qlen = query_extract_from_buf(q_args->buf, &(q_args->buf_used),
                                         &query))) {
-    // write(STDOUT_FILENO, query, strlen(query));
+    if (4 == sscanf(query, "=== PAGE %u/%u COUNT: %u/%u ===", &current_page,
+                    &pages, &current_count, &full_count)) {
+      fui->current_page = current_page;
+      fui->current_count = current_count;
+      fui->full_count = full_count;
+      fui->pages = pages;
+      draw_file_list(fui);
+      return;
+    }
   }
 }
 
@@ -71,7 +84,7 @@ void file_select(file_args_t *f_args, query_args_t *q_args) {
   uint32_t qlen;
   char send_buf[256];
   struct stat st = {0};
-  
+
   if (!(sscanf(buf, "%u", &filenum))) {
     write(q_args->sd, buf, strlen(buf));
     q_args->state = S_FILE_LIST;
@@ -286,7 +299,7 @@ static fl_item_t *fl_select(fl_item_t *start, int num) {
   return current;
 }
 
-static void fl_clear(fl_item_t **start, fl_item_t **arg_current) {
+void fl_clear(fl_item_t **start, fl_item_t **arg_current) {
   if (*start == NULL)
     return;
   fl_item_t *next, *current;
diff --git a/src/file_processor.h b/src/file_processor.h
index 149b12b..45206f3 100644
--- a/src/file_processor.h
+++ b/src/file_processor.h
@@ -9,5 +9,6 @@ void init_file_args(file_args_t *fargs);
 int file_upload_request(char *, query_args_t *q_args);
 int file_upload_start(query_args_t *q_args);
 int file_upload(query_args_t *q_args);
+void fl_clear(fl_item_t **start, fl_item_t **arg_current);
 
 #endif
\ No newline at end of file
diff --git a/src/server.c b/src/server.c
index e14e7ce..f6b96ee 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1,7 +1,5 @@
-#include "client.h"
 #include "main.h"
 #include "ui.h"
-#include "ui/widget/file_list.h"
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <netinet/in.h>
@@ -114,12 +112,12 @@ int process_server_command(char *line, int l_len, query_args_t *q_args) {
       q_args->server_message.text[q_args->server_message.size + l_len] = 0;
     }
   } else {
-    char buf[INBUFSIZE + sizeof("server: ")] = "server: ";
-    strcat(buf, line);
-    write(STDOUT_FILENO, buf, l_len + sizeof("server: "));
-    if (q_args->state == WAIT_CLIENT) {
-      print_prompt(q_args->params);
-    }
+    /* char buf[INBUFSIZE + sizeof("server: ")] = "server: ";
+      strcat(buf, line);
+      write(STDOUT_FILENO, buf, l_len + sizeof("server: "));
+      if (q_args->state == WAIT_CLIENT) {
+        print_prompt(q_args->params);
+    } */
   }
 
   return 0;
diff --git a/src/ui/widget/dialogue.c b/src/ui/widget/dialogue.c
index 2a411c2..5ba5b59 100644
--- a/src/ui/widget/dialogue.c
+++ b/src/ui/widget/dialogue.c
@@ -199,10 +199,8 @@ int32_t draw_dialogue(dialogue_t *d) {
   wattrset(d->win, COLOR_PAIR(0) | A_BOLD | A_REVERSE);
 
   /* background */
-  for (int xp = 1; xp < d->w.x; xp++) {
-    for (int yp = 1; yp < d->w.y - 1; yp++) {
-      mvwprintw(d->win, yp, xp, " ");
-    }
+  for (int yp = 1; yp < d->w.y - 1; yp++) {
+    mvwprintw(d->win, yp, 1, "%*s", d->w.x, "");
   }
 
   /* title */
diff --git a/src/ui/widget/file_list.c b/src/ui/widget/file_list.c
index af857f0..bf27b9e 100644
--- a/src/ui/widget/file_list.c
+++ b/src/ui/widget/file_list.c
@@ -1,26 +1,46 @@
 #include "file_list.h"
+#include "../../file_processor.h"
 #include "../app.h"
 #include <ncurses.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
+#include <unistd.h>
+
+void reset_file_list(file_list_t *fl_ui);
 
 void file_list_cb(callback_args_t *args) {
   app_t *app = args->app;
   file_list_t *fui = app->query_args->file_list_ui;
   int32_t key = *((int32_t *)args->data);
+  char switch_page_query[10];
+  int32_t spq_len = 0;
   switch (key) {
   case KEY_DOWN:
-    if (fui->current_idx < fui->count - 1) {
+    if (fui->current_idx < fui->current_count - 1) {
       fui->current_idx++;
-      redraw_file_list(fui);
+      draw_file_list(fui);
+    } else if (fui->current_page < fui->pages) {
+      fl_clear(fui->start, fui->current);
+      app->query_args->state = S_FILE_LIST;
+      sprintf(switch_page_query, "p%u\n%n", fui->current_page + 1, &spq_len);
+      write(app->query_args->sd, switch_page_query, spq_len);
+      reset_file_list(fui);
     }
     break;
   case KEY_UP:
     if (fui->current_idx > 0) {
       fui->current_idx--;
-      redraw_file_list(fui);
+      draw_file_list(fui);
+    } else if (fui->current_page > 1) {
+      fl_clear(fui->start, fui->current);
+      app->query_args->state = S_FILE_LIST;
+      sprintf(switch_page_query, "p%u\n%n", fui->current_page - 1, &spq_len);
+      write(app->query_args->sd, switch_page_query, spq_len);
+      reset_file_list(fui);
+      fui->activate_last = true;
     }
     break;
   }
@@ -32,7 +52,9 @@ file_list_t *init_file_list(WINDOW **win) {
   fl_ui->current_idx = 0;
   fl_ui->current_page = 0;
   fl_ui->pages = 0;
-  fl_ui->count = 0;
+  fl_ui->current_count = 0;
+  fl_ui->full_count = 0;
+  fl_ui->activate_last = false;
   return fl_ui;
 }
 
@@ -40,75 +62,66 @@ void reset_file_list(file_list_t *fl_ui) {
   fl_ui->current_idx = 0;
   fl_ui->current_page = 0;
   fl_ui->pages = 0;
-  fl_ui->count = 0;
+  fl_ui->current_count = 0;
+  fl_ui->full_count = 0;
+  fl_ui->activate_last = false;
 }
 
 void draw_file_list(file_list_t *fl_ui) {
-  int32_t sz_y, sz_x;
-  int32_t p_y, p_x;
-  getmaxyx(*(fl_ui->w.parent_win), sz_y, sz_x);
-  p_y = 1;
-  p_x = 1;
-  fl_item_t *el = fl_ui->start;
-  int32_t cur_el_idx = 0;
-  curs_set(0);
-
-  do {
-    if (cur_el_idx == fl_ui->current_idx) {
-      wattrset(*(fl_ui->w.parent_win), A_BOLD | A_REVERSE);
-    }
-    p_x = 1;
-    mvwprintw(*(fl_ui->w.parent_win), p_y, p_x, "%s%n", el->name, &p_x);
-    for (uint i = 1; p_x < sz_x; i++) {
-      mvwprintw(*(fl_ui->w.parent_win), p_y, ++p_x, " ");
-    }
-    if (cur_el_idx == fl_ui->current_idx) {
-      wattroff(*(fl_ui->w.parent_win), A_BOLD | A_REVERSE);
-    }
-    p_y++;
-    cur_el_idx++;
-  } while ((el = el->next) != NULL && p_y < sz_y);
-}
-
-void redraw_file_list(file_list_t *fl_ui) {
-  static uint32_t active_idx = 0;
   int32_t sz_y, sz_x;
   int32_t p_y, p_x;
   getmaxyx(*(fl_ui->w.parent_win), sz_y, sz_x);
   int32_t sz_y_f = sz_y - 2; // factual size (without box)
   p_y = 1;
   p_x = 1;
-  fl_item_t *el = fl_ui->start;
+  fl_item_t *el = *(fl_ui->start);
   int32_t cur_el_idx = 0;
-  bool sm_size = sz_y_f < fl_ui->count;
-  bool print_all = false;
-  int32_t diff = 0;
+  WINDOW *win = *(fl_ui->w.parent_win);
+  curs_set(0);
 
-  if (fl_ui->current_idx >= sz_y_f) {
-    print_all = true;
-    diff = fl_ui->current_idx - sz_y_f + 1;
-  } else if (active_idx - fl_ui->current_idx == 1) {
-    print_all = true;
+  if (fl_ui->activate_last) {
+    fl_ui->current_idx = fl_ui->current_count - 1;
+    fl_ui->activate_last = false;
+  }
+
+  if (fl_ui->current_idx + 1 >= sz_y_f) {
+    p_y -= fl_ui->current_idx - sz_y_f + 2;
   }
 
   do {
-    if (cur_el_idx == fl_ui->current_idx) {
-      wattrset(*(fl_ui->w.parent_win), A_BOLD | A_REVERSE);
-    } else if (cur_el_idx != active_idx && !print_all) {
+    if (p_y < 1) {
       p_y++;
       cur_el_idx++;
       continue;
     }
-    p_x = 1;
-    mvwprintw(*(fl_ui->w.parent_win), p_y-diff, p_x, "%s%n", el->name, &p_x);
-    for (uint i = 1; p_x < sz_x; i++) {
-      mvwprintw(*(fl_ui->w.parent_win), p_y-diff, ++p_x, " ");
-    }
     if (cur_el_idx == fl_ui->current_idx) {
-      wattroff(*(fl_ui->w.parent_win), A_BOLD | A_REVERSE);
+      wattrset(win, A_BOLD | A_REVERSE);
+    }
+    p_x = 1;
+    mvwprintw(win, p_y, p_x, "%s%n", el->name, &p_x);
+    mvwprintw(win, p_y, p_x + 1, "%*s", sz_x - p_x, "");
+    if (cur_el_idx == fl_ui->current_idx) {
+      wattroff(win, A_BOLD | A_REVERSE);
     }
     p_y++;
     cur_el_idx++;
-  } while ((el = el->next) != NULL && p_y-diff < sz_y);
-  active_idx = fl_ui->current_idx;
+  } while ((el = el->next) != NULL && p_y < sz_y_f);
+
+  p_x = 1;
+
+  for (; p_y < sz_y_f; p_y++) {
+    mvwprintw(win, p_y, p_x, "%*s", sz_x - 1, "");
+  }
+  char p_info[24];
+  uint32_t p_len;
+  p_x = 1;
+
+  sprintf(p_info, "page: %u/%u files: %u/%u%n", fl_ui->current_page,
+          fl_ui->pages, fl_ui->current_count, fl_ui->full_count, &p_len);
+
+  uint32_t l_pad = (sz_x - p_len) / 2;
+
+  wattrset(win, A_BOLD);
+  mvwprintw(win, p_y, p_x, "%*s%s%*s", l_pad, "", p_info, l_pad, "");
+  wattroff(win, A_BOLD);
 }
\ No newline at end of file
diff --git a/src/ui/widget/file_list.h b/src/ui/widget/file_list.h
index 5a1a254..afc996d 100644
--- a/src/ui/widget/file_list.h
+++ b/src/ui/widget/file_list.h
@@ -4,12 +4,14 @@
 #include <stdint.h>
 typedef struct {
     widget_t w;
-    fl_item_t *current;
-    fl_item_t *start;
+    fl_item_t **current;
+    fl_item_t **start;
     int32_t current_idx;
-    uint32_t count;
+    uint32_t current_count;
+    uint32_t full_count;
     uint32_t pages;
     uint32_t current_page;
+    uint32_t activate_last : 1;
 } file_list_t;
 
 void draw_file_list(file_list_t *fl_ui);
diff --git a/src/ui/widget/input.c b/src/ui/widget/input.c
index f9b35b3..bccf676 100644
--- a/src/ui/widget/input.c
+++ b/src/ui/widget/input.c
@@ -56,12 +56,10 @@ int32_t draw_input(input_t *input, uint32_t active_id) {
   }
 
   uint32_t x_c = 0;
-  mvwprintw(win, margin_y + 1, margin_x, "%s", input->value);
+  mvwprintw(win, margin_y + 1, margin_x, "%s%*s", input->value,
+            input->w.x - input->value_len - 2, "");
   input->w.cur.y = margin_y + 1;
   input->w.cur.x = margin_x;
-  for (int i = 0; i < input->w.x - input->value_len - 2; i++) {
-    mvwprintw(win, margin_y + 1, margin_x + i + input->value_len, " ");
-  }
 
   wattroff(win, A_BOLD | A_REVERSE);
   return 0;