diff --git a/tests/get_feed_efl.c b/tests/get_feed_efl.c
index 4051adc..6e6db66 100644
--- a/tests/get_feed_efl.c
+++ b/tests/get_feed_efl.c
@@ -1,30 +1,28 @@
+#define _POSIX_C_SOURCE 200112L
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <mastodont.h>
 
+#include <signal.h>
 #define EFL_BETA_API_SUPPORT 1
  
 #include <Efl_Ui.h>
 
+Eo* textbox_instance;
 Eo* fd;
+Eo* posts;
 mastodont_t mstdnt;
 
 static void
 gui_quit_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
 {
+	mstdnt_cleanup(&data);
+	mstdnt_global_curl_cleanup();
 	efl_exit(0);
 }
 
-static void
-_efl_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
-{
-   Eina_Bool *dead = data;
-
-   *dead = EINA_TRUE;
-}
-
-
 int
 tl_callback(mstdnt_request_cb_data* cb_data, void* args)
 {
@@ -38,6 +36,21 @@ tl_callback(mstdnt_request_cb_data* cb_data, void* args)
 	return MSTDNT_REQUEST_DONE;
 }
 
+static void
+gui_fetch_posts(void* data EINA_UNUSED, const Efl_Event* event EINA_UNUSED)
+{
+	struct mstdnt_args m_args = {
+		.url = NULL,
+		.token = NULL,
+		.flags = 0,
+	};
+	
+	mstdnt_timeline_public(&mstdnt, &m_args, tl_callback, NULL, (struct mstdnt_timeline_args){.limit=20});
+	
+	mstdnt_await(&data, 0, NULL, 0);
+}
+
+#if 0
 static void
 update_mstdnt_fds(void)
 {
@@ -55,9 +68,10 @@ update_mstdnt_fds(void)
                      efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &set));
 	}
 }
- 
+#endif
+
 static void
-gui_setup()
+gui_setup(void)
 {
 	Eo *win, *box;
 	
@@ -65,45 +79,44 @@ gui_setup()
 	              efl_main_loop_get(),
 	              efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
 	              efl_text_set(efl_added, "Hello World"),
-	              efl_ui_win_autodel_set(efl_added, EINA_TRUE));
-
-	efl_event_callback_add(win, 
-	                       EFL_UI_WIN_EVENT_DELETE_REQUEST,
-	                       gui_quit_cb,
-	                       NULL);
+	              efl_ui_win_autodel_set(efl_added, EINA_TRUE),
+	              efl_event_callback_add(efl_added, 
+	                                     EFL_UI_WIN_EVENT_DELETE_REQUEST,
+	                                     gui_quit_cb,
+	                                     NULL));
 	
- 
 	box = efl_add(EFL_UI_BOX_CLASS,
 	              win,
 	              efl_content_set(win, efl_added),
-	              efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(360, 240)));
+	              efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(460, 640)));
+	              
+	posts = efl_add(EFL_UI_LIST_CLASS,
+	                box,
+	                //efl_text_interactive_selection_allowed_set(efl_added, EINA_FALSE),
+	                //efl_gfx_hint_weight_set(efl_added, 1.0, 0.9),
+	                //efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
+	                efl_pack(box, efl_added));
 
-#if 0
-	efl_add(EFL_UI_TEXTBOX_CLASS,
-	        box,
-	        efl_text_markup_set(efl_added, "Super Treebird"),
-	        //efl_text_interactive_selection_allowed_set(efl_added, EINA_FALSE),
-	        //efl_gfx_hint_weight_set(efl_added, 1.0, 0.9),
-	        //efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
-	        efl_pack(box, efl_added));
-#endif 
- 
+	textbox_instance = efl_add(EFL_UI_TEXTBOX_CLASS,
+	                           box,
+	                           efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
+	                           efl_pack(box, efl_added));
+		
 	efl_add(EFL_UI_BUTTON_CLASS,
 	        box,
 	        efl_text_set(efl_added, "Fetch posts asynchronously"),
 	        efl_gfx_hint_weight_set(efl_added, 1.0, 0.5),
 	        efl_pack(box, efl_added),
 	        efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
-                                   gui_quit_cb, efl_added));
+                                   gui_fetch_posts, efl_added));
 }
  
 EAPI_MAIN void
 efl_main(void *edata EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
 {
-   
+	// Initialize Mastodont library
 	mstdnt_global_curl_init();
 	
-	
 	if (mstdnt_init(&mstdnt) != 0)
 	{
 		fputs("Couldn't initialize Mastodont-c!", stderr);
@@ -111,23 +124,6 @@ efl_main(void *edata EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
 	}
 	
 	gui_setup();
-
-#if 0
-	struct mstdnt_args m_args = {
-		.url = instance,
-		.token = NULL,
-		.flags = 0,
-	};
-	
-	mstdnt_timeline_public(&mstdnt, &m_args, tl_callback, NULL, (struct mstdnt_timeline_args){.limit=20});
-	
-	mstdnt_await(&data, 0, NULL, 0);
-
-	// Cleanup	
-	//free(instance);
-	//mstdnt_cleanup(&data);
-	//mstdnt_global_curl_cleanup();
-#endif	
 }
 EFL_MAIN()