diff --git a/Makefile b/Makefile
index e5fb530..a99e58e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ LIBS += $(DEP)/lib/libusb-1.0.a
 
 ifeq ($(DEV_BUILD),1)
 LIBS += $(DEP)/lib/libmenutw.a $(DEP)/lib/libncursestw.a
-CFLAGS += -O0 -g -DDEV_BUILD -fsanitize=address -fno-omit-frame-pointer -fsanitize-address-use-after-return=runtime
+CFLAGS += -O0 -g -DDEV_BUILD -fsanitize=address,undefined -fno-omit-frame-pointer -fsanitize-address-use-after-return=runtime
 else
 CFLAGS += -Os -g
 endif
diff --git a/src/tui_screen_main.c b/src/tui_screen_main.c
index 64e9bec..cb4aaf9 100644
--- a/src/tui_screen_main.c
+++ b/src/tui_screen_main.c
@@ -73,6 +73,7 @@ tui_screen_t tui_screen_main() {
     main_buttons[3] = NULL;
     main_menu = new_menu(main_buttons);
     item_opts_off(main_buttons[1], O_SELECTABLE);
+    
     set_menu_format(main_menu, 1, 40);
     set_menu_sub(main_menu, derwin(stdscr, 0, 0, 22, 50));
     post_menu(main_menu);
@@ -100,10 +101,10 @@ tui_screen_t tui_screen_main() {
     }
 end:
     noraw();
+    unpost_menu(main_menu);
     free_menu(main_menu);
     free_item(main_buttons[0]);
     free_item(main_buttons[1]);
     free_item(main_buttons[2]);
-    refresh();
     return ret;
 }
diff --git a/src/tui_screen_options.c b/src/tui_screen_options.c
index ae6bc81..e966bcc 100644
--- a/src/tui_screen_options.c
+++ b/src/tui_screen_options.c
@@ -32,6 +32,9 @@ tui_screen_t tui_screen_options() {
     set_menu_sub(back_menu, derwin(stdscr, 0, 0, 22, 68));
     post_menu(back_menu);
 
+    FORM* options_form;
+    FIELD* options[3];
+    
 
     refresh();
 
@@ -47,5 +50,8 @@ tui_screen_t tui_screen_options() {
         refresh();
     }
 end:
+    unpost_menu(back_menu);
+    free_item(back_button[0]);
+    free_menu(back_menu);
     return ret;
 }