diff --git a/src/bin/edi_consolepanel.c b/src/bin/edi_consolepanel.c
index 42c8765..36e8d42 100644
--- a/src/bin/edi_consolepanel.c
+++ b/src/bin/edi_consolepanel.c
@@ -336,12 +336,19 @@ _edi_consolepanel_config_changed(void *data EINA_UNUSED, int type EINA_UNUSED, v
 
 void edi_consolepanel_add(Evas_Object *parent)
 {
+   Evas_Object *frame;
    Elm_Code *code;
    Elm_Code_Widget *widget;
 
    code = elm_code_create();
    _edi_console_code = code;
 
+   frame = elm_frame_add(parent);
+   elm_object_text_set(frame, _("Console"));
+   evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(frame);
+
    widget = elm_code_widget_add(parent, code);
    elm_obj_code_widget_font_set(widget, _edi_project_config->font.name, _edi_project_config->font.size);
    edi_theme_elm_code_set(widget, _edi_project_config->gui.theme);
@@ -353,7 +360,8 @@ void edi_consolepanel_add(Evas_Object *parent)
    evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(widget);
 
-   elm_box_pack_end(parent, widget);
+   elm_object_content_set(frame, widget);
+   elm_box_pack_end(parent, frame);
 
    ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _exe_data, NULL);
    ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _exe_error, NULL);
@@ -362,12 +370,19 @@ void edi_consolepanel_add(Evas_Object *parent)
 
 void edi_testpanel_add(Evas_Object *parent)
 {
+   Evas_Object *frame;
    Elm_Code *code;
    Elm_Code_Widget *widget;
 
    code = elm_code_create();
    _edi_test_code = code;
 
+   frame = elm_frame_add(parent);
+   elm_object_text_set(frame, _("Tests"));
+   evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(frame);
+
    widget = elm_code_widget_add(parent, code);
    elm_obj_code_widget_font_set(widget, _edi_project_config->font.name, _edi_project_config->font.size);
    edi_theme_elm_code_set(widget, _edi_project_config->gui.theme);
@@ -379,6 +394,7 @@ void edi_testpanel_add(Evas_Object *parent)
    evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(widget);
 
-   elm_box_pack_end(parent, widget);
+   elm_object_content_set(frame, widget);
+   elm_box_pack_end(parent, frame);
 }
 
diff --git a/src/bin/edi_debugpanel.c b/src/bin/edi_debugpanel.c
index 036df9d..0adcdfd 100644
--- a/src/bin/edi_debugpanel.c
+++ b/src/bin/edi_debugpanel.c
@@ -315,13 +315,22 @@ void edi_debugpanel_start(const char *name)
 
 void edi_debugpanel_add(Evas_Object *parent)
 {
-   Evas_Object *table, *entry, *bt_term, *bt_int, *bt_start, *bt_quit;
+   Evas_Object *table, *frame, *box, *entry, *bt_term, *bt_int, *bt_start, *bt_quit;
    Evas_Object *separator;
    Evas_Object *ico_start, *ico_quit, *ico_int, *ico_term;
    Elm_Code_Widget *widget;
    Elm_Code *code;
    Ecore_Timer *timer;
 
+   frame = elm_frame_add(parent);
+   elm_object_text_set(frame, _("Debug"));
+   evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+   box = elm_box_add(parent);
+   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
    code = elm_code_create();
    widget = elm_code_widget_add(parent, code);
    elm_obj_code_widget_font_set(widget, _edi_project_config->font.name, _edi_project_config->font.size);
@@ -401,8 +410,13 @@ void edi_debugpanel_add(Evas_Object *parent)
    timer = ecore_timer_add(1.0, _edi_debug_active_check_cb, NULL);
    (void) timer;
 
-   elm_box_pack_end(parent, widget);
-   elm_box_pack_end(parent, table);
+   elm_box_pack_end(box, widget);
+   elm_box_pack_end(box, table);
+   evas_object_show(box);
+
+   elm_object_content_set(frame, box);
+   evas_object_show(frame);
+   elm_box_pack_end(parent, frame);
 
    ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _debugpanel_stdout_handler, NULL);
    ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _debugpanel_stdout_handler, NULL);
diff --git a/src/bin/edi_logpanel.c b/src/bin/edi_logpanel.c
index 19c579a..4c27f00 100644
--- a/src/bin/edi_logpanel.c
+++ b/src/bin/edi_logpanel.c
@@ -75,9 +75,16 @@ _edi_logpanel_config_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void
 
 void edi_logpanel_add(Evas_Object *parent)
 {
+   Evas_Object *frame;
    Elm_Code_Widget *widget;
    Elm_Code *code;
 
+   frame = elm_frame_add(parent);
+   elm_object_text_set(frame, _("Logs"));
+   evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(frame);
+
    code = elm_code_create();
    widget = elm_code_widget_add(parent, code);
    edi_theme_elm_code_set(widget, _edi_project_config->gui.theme);
@@ -94,6 +101,7 @@ void edi_logpanel_add(Evas_Object *parent)
    eina_log_print_cb_set(_edi_logpanel_print_cb, NULL);
    eina_log_color_disable_set(EINA_TRUE);
 
-   elm_box_pack_end(parent, widget);
+   elm_object_content_set(frame, widget);
+   elm_box_pack_end(parent, frame);
    ecore_event_handler_add(EDI_EVENT_CONFIG_CHANGED, _edi_logpanel_config_changed, NULL);
 }
diff --git a/src/bin/edi_searchpanel.c b/src/bin/edi_searchpanel.c
index 6404119..c780962 100644
--- a/src/bin/edi_searchpanel.c
+++ b/src/bin/edi_searchpanel.c
@@ -231,8 +231,16 @@ edi_searchpanel_find(const char *text)
 void
 edi_searchpanel_add(Evas_Object *parent)
 {
+   Evas_Object *frame;
    Elm_Code_Widget *widget;
    Elm_Code *code;
+
+   frame = elm_frame_add(parent);
+   elm_object_text_set(frame, _("Search"));
+   evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(frame);
+
    code = elm_code_create();
    widget = elm_code_widget_add(parent, code);
    edi_theme_elm_code_set(widget, _edi_project_config->gui.theme);
@@ -246,7 +254,9 @@ edi_searchpanel_add(Evas_Object *parent)
    _elm_code = code;
    _info_widget = widget;
 
-   elm_box_pack_end(parent, widget);
+   elm_object_content_set(frame, widget);
+   elm_box_pack_end(parent, frame);
+
    ecore_event_handler_add(EDI_EVENT_CONFIG_CHANGED, _edi_searchpanel_config_changed_cb, NULL);
 }
 
@@ -300,8 +310,16 @@ edi_taskspanel_find(void)
 void
 edi_taskspanel_add(Evas_Object *parent)
 {
+   Evas_Object *frame;
    Elm_Code_Widget *widget;
    Elm_Code *code;
+
+   frame = elm_frame_add(parent);
+   elm_object_text_set(frame, _("Tasks"));
+   evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(frame);
+
    code = elm_code_create();
    widget = elm_code_widget_add(parent, code);
    edi_theme_elm_code_set(widget, _edi_project_config->gui.theme);
@@ -316,7 +334,9 @@ edi_taskspanel_add(Evas_Object *parent)
    _tasks_code = code;
    _tasks_widget = widget;
 
-   elm_box_pack_end(parent, widget);
+   elm_object_content_set(frame, widget);
+   elm_box_pack_end(parent, frame);
+
    ecore_event_handler_add(EDI_EVENT_CONFIG_CHANGED, _edi_taskspanel_config_changed_cb, NULL);
 
    edi_taskspanel_find();