7 files changed, 258 insertions, 273 deletions

diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index 8bd357b..f9219bc 100644..100755
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -489,11 +489,10 @@ void _activation_cb(int error_code, wifi_direct_device_state_e device_state, voi
 		 */
 		if (ugd->disconnect_btn) {
 			Evas_Object *content;
-			content = elm_object_part_content_unset(ugd->layout, "button.next");
+			content = elm_object_part_content_unset(ugd->button_layout, "button.next");
 			WFD_IF_DEL_OBJ(content);
 			ugd->disconnect_btn = NULL;
-			elm_object_part_content_set(ugd->layout, "button.big",
-			ugd->scan_toolbar);
+			elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar);
 		}
 
 		/* When connect is on ongoing and deactivte happened refresh scan */
@@ -957,7 +956,7 @@ void discover_cb(int error_code, wifi_direct_discovery_state_e discovery_state,
 		ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START) {
 		WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item);
 		if (!ugd->conn_wfd_item) {
-			elm_object_part_content_set(ugd->layout, "button.big", ugd->scan_toolbar);
+			elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar);
 		}
 		wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK_STOP", TRUE);
 		if (ugd->multiconn_scan_stop_btn) {
@@ -1069,10 +1068,6 @@ void _connection_cb(int error_code, wifi_direct_connection_state_e connection_st
 					_wfd_ug_auto_exit(ugd);
 				}
 
-				if(ugd->ctxpopup != NULL && ugd->more_btn_multiconnect_item) {
-					elm_object_item_disabled_set(ugd->more_btn_multiconnect_item, TRUE);
-				}
-
 				wfd_ug_update_connected_peers(ugd);
 			} else {
 				peer->conn_status = PEER_CONN_STATUS_FAILED_TO_CONNECT;
@@ -1103,8 +1098,11 @@ void _connection_cb(int error_code, wifi_direct_connection_state_e connection_st
 			WFD_IF_DEL_OBJ(ugd->act_popup);
 
 			Evas_Object *content;
-			content = elm_object_part_content_unset(ugd->layout, "button.next");
+			content = elm_object_part_content_unset(ugd->button_layout, "button.next");
 			WFD_IF_DEL_OBJ(content);
+			content = elm_object_part_content_unset(ugd->button_layout, "button.prev");
+			evas_object_hide(content);
+
 			/* when disconnection, clear all the connected peers */
 			if (ugd->raw_connected_peer_cnt > 0) {
 				memset(ugd->raw_connected_peers, 0x00, ugd->raw_connected_peer_cnt*sizeof(device_type_s));
@@ -1479,13 +1477,11 @@ void wfd_gdbus_callback(GObject *source_object, GAsyncResult *result, gpointer u
 	WFD_RET_IF(res != 0, "Failed to initialize WFD client library\n");
 
 	/* Activate WiFi Direct */
-	/*
 	DBG(LOG_INFO, "Activating WiFi Direct...");
 	if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
 		res = wfd_client_switch_on(ugd);
 		WFD_RET_IF(res != 0, "Failed to activate WFD\n");
 	}
-	*/
 
 	__FUNC_EXIT__;
 }
diff --git a/ug-wifidirect/src/wfd_ug.c b/ug-wifidirect/src/wfd_ug.c
index de5db8c..5d6ab85 100644..100755
--- a/ug-wifidirect/src/wfd_ug.c
+++ b/ug-wifidirect/src/wfd_ug.c
@@ -140,28 +140,6 @@ static void __wfd_hotspot_mode_vconf_change_cb(keynode_t *key, void *data)
 
 }
 
-Ea_Theme_Color_Table *_color_table_set(void)
-{
-	Ea_Theme_Color_Table *table;
-
-	table = ea_theme_color_table_new(COLOR_TABLE);
-	DBG(LOG_INFO, "Wi-Fi direct color table : %p", table);
-	ea_theme_colors_set(table, EA_THEME_STYLE_DEFAULT);
-
-	return table;
-}
-
-Ea_Theme_Font_Table *_font_table_set(void)
-{
-	Ea_Theme_Font_Table *table;
-
-	table = ea_theme_color_table_new(FONT_TABLE);
-	DBG(LOG_INFO, "Wi-Fi direct font table : %p", table);
-	ea_theme_fonts_set(table);
-
-	return table;
-}
-
 /**
  *	This function let the ug create backgroud
  *	@return  backgroud
@@ -343,8 +321,11 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, app_control_h control,
 		return NULL;
 	}
 
-	elm_win_wm_rotation_available_rotations_set(ugd->win, rots, 1);
-
+	/* set rotation */
+	if (elm_win_wm_rotation_supported_get(ugd->win)) {
+		int rots[4] = {0, 90, 180, 270};
+		elm_win_wm_rotation_available_rotations_set(ugd->win, (const int *)(&rots), 4);
+	}
 
 	/* check the input parameters from app at first */
 	ugd->wfds = NULL;
@@ -479,12 +460,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, app_control_h control,
 		return NULL;
 	}
 
-	/* Enablee Changeable UI feature */
-	ea_theme_changeable_ui_enabled_set(EINA_TRUE);
-
-	ugd->color_table = _color_table_set();
-	ugd->font_table = _font_table_set();
-
 	/* draw UI */
 	initialize_gen_item_class();
 	create_wfd_ug_view(ugd);
diff --git a/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c
index 0a0a025..3077726 100755
--- a/ug-wifidirect/src/wfd_ug_genlist.c
+++ b/ug-wifidirect/src/wfd_ug_genlist.c
@@ -61,28 +61,26 @@ static char *_gl_wfd_onoff_text_get(void *data, Evas_Object *obj,
 	__FUNC_ENTER__;
 
 	struct ug_data *ugd = (struct ug_data *) data;
+	char *dev_name = NULL;
 	DBG(LOG_INFO, "%s", part);
 	WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
 	wfd_get_vconf_device_name(ugd);
-	char *dev_name;
 
-	if (!g_strcmp0(part,"elm.text.main.left.bottom")) {
+	if (!strcmp("elm.text.sub", part)) {
+		__FUNC_EXIT__;
+		return g_strdup(_("IDS_ST_HEADER_MY_DEVICE_NAME"));
+	} else if (!strcmp("elm.text", part)) {
 		DBG(LOG_INFO, "%s", ugd->dev_name);
 		if (ugd->dev_name) {
 			dev_name = elm_entry_utf8_to_markup(ugd->dev_name);
 			if (NULL == dev_name) {
 				DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n");
-				__FUNC_EXIT__;
-				return NULL;
 			}
-			__FUNC_EXIT__;
-			return dev_name;
 		}
-	} else if (!g_strcmp0(part, "elm.text.sub.left.top")) {
-		return g_strdup(_("IDS_ST_HEADER_MY_DEVICE_NAME"));
 	}
+
 	__FUNC_EXIT__;
-	return NULL;
+	return dev_name;
 }
 
 static Evas_Object *_gl_wfd_onoff_content_get(void *data,Evas_Object *obj,
@@ -94,25 +92,24 @@ static Evas_Object *_gl_wfd_onoff_content_get(void *data,Evas_Object *obj,
 	WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
 	Evas_Object *btn = NULL;
 	Evas_Object *icon = NULL;
-	icon = elm_layout_add(obj);
 
-	if (g_strcmp0(part, "elm.icon.2")) {
-		return NULL;
+	if (!strcmp("elm.swallow.end", part)) {
+		icon = elm_layout_add(obj);
+		elm_layout_theme_set(icon, "layout", "list/C/type.3", "default");
+
+		/* Wi-Fi on indication button */
+		btn= elm_check_add(icon);
+		elm_object_style_set(btn, "on&off");
+		elm_check_state_set(btn, ugd->wfd_onoff);
+		evas_object_propagate_events_set(btn, EINA_FALSE);
+		evas_object_smart_callback_add(btn, "changed",_onoff_changed_cb, ugd);
+		ugd->on_off_check = btn;
+		evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+		evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND,
+				EVAS_HINT_EXPAND);
+		elm_layout_content_set(icon, "elm.swallow.content", btn);
 	}
-	elm_layout_theme_set(icon, "layout", "list/C/type.3", "default");
-	btn = elm_check_add(icon);
-	/* Wi-Fi on indication button */
-	btn= elm_check_add(icon);
-	elm_object_style_set(btn, "on&off");
-	evas_object_propagate_events_set(btn, EINA_FALSE);
-	elm_check_state_set(btn, ugd->wfd_onoff);
-	evas_object_propagate_events_set(btn, EINA_FALSE);
-	evas_object_smart_callback_add(btn, "changed",_onoff_changed_cb, ugd);
-	ugd->on_off_check = btn;
-	evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND,
-			EVAS_HINT_EXPAND);
-	elm_layout_content_set(icon, "elm.swallow.content", btn);
+
 	__FUNC_EXIT__;
 	return icon;
 }
@@ -134,9 +131,11 @@ static char *_gl_device_name_label_get(void *data, Evas_Object *obj,
 	DBG(LOG_INFO, "%s", part);
 	WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
 	wfd_get_vconf_device_name(ugd);
-	char *dev_name;
+	char *dev_name = NULL;
+	char str[WFD_GLOBALIZATION_STR_LENGTH] = {0, };
+	char buf[WFD_GLOBALIZATION_STR_LENGTH] = {0, };
 
-	if (!g_strcmp0(part,"elm.text.main.left.bottom")) {
+	if (!strcmp("elm.text.multiline", part)) {
 		DBG(LOG_INFO, "%s", ugd->dev_name);
 		if (ugd->dev_name) {
 			dev_name = elm_entry_utf8_to_markup(ugd->dev_name);
@@ -145,11 +144,18 @@ static char *_gl_device_name_label_get(void *data, Evas_Object *obj,
 				__FUNC_EXIT__;
 				return NULL;
 			}
+
+			snprintf(str, WFD_GLOBALIZATION_STR_LENGTH,
+				_("IDS_WIFI_BODY_YOUR_DEVICE_HPS_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES"),
+				dev_name);
+
+			snprintf(buf, WFD_GLOBALIZATION_STR_LENGTH,
+				"<font_size=30>%s</font_size>", str);
+
+			WFD_IF_FREE_MEM(dev_name);
 			__FUNC_EXIT__;
-			return dev_name;
+			return g_strdup(buf);
 		}
-	} else if (!g_strcmp0(part, "elm.text.sub.left.top")) {
-		return g_strdup(_("IDS_ST_HEADER_MY_DEVICE_NAME"));
 	}
 	__FUNC_EXIT__;
 	return NULL;
@@ -168,7 +174,7 @@ static char *_gl_title_label_get(void *data, Evas_Object *obj, const char *part)
 
 	WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n");
 	DBG(LOG_INFO, "%s", part);
-	if (!g_strcmp0(part, "elm.text.main")) {
+	if (!strcmp("elm.text", part)) {
 		return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
 	}
 	__FUNC_EXIT__;
@@ -183,7 +189,7 @@ static char *_gl_title_no_device_label_get(void *data, Evas_Object *obj,
 
 	WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n");
 	DBG(LOG_INFO, "%s", part);
-	if (!g_strcmp0(part, "elm.text.main")) {
+	if (!strcmp("elm.text", part)) {
 		return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
 	}
 
@@ -196,7 +202,7 @@ static char *_gl_multi_title_label_get(void *data, Evas_Object *obj, const char
 	__FUNC_ENTER__;
 
 	WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n");
-	if (!g_strcmp0(part, "elm.text.main")) {
+	if (!strcmp("elm.text", part)) {
 		return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
 	}
 
@@ -212,19 +218,16 @@ static Evas_Object *_gl_multi_title_content_get(void *data, Evas_Object *obj, co
 	struct ug_data *ugd = (struct ug_data *) data;
 	WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n");
 
-	if (!g_strcmp0(part, "elm.icon")) {
-		if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) {
-			progressbar = elm_progressbar_add(obj);
-			elm_object_style_set(progressbar, "process_small");
-			elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
-			elm_progressbar_pulse(progressbar, EINA_TRUE);
-			evas_object_show(progressbar);
-			return progressbar;
-		}
+	if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) {
+		progressbar = elm_progressbar_add(obj);
+		elm_object_style_set(progressbar, "process_small");
+		elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
+		elm_progressbar_pulse(progressbar, EINA_TRUE);
+		evas_object_show(progressbar);
 	}
 
 	__FUNC_EXIT__;
-	return NULL;
+	return progressbar;
 }
 
 static char *_gl_available_title_label_get(void *data, Evas_Object *obj, const char *part)
@@ -236,7 +239,7 @@ static char *_gl_available_title_label_get(void *data, Evas_Object *obj, const c
 		return NULL;
 	}
 	DBG(LOG_INFO, "available- %s", part);
-	if (!g_strcmp0(part, "elm.text.main")) {
+	if (!strcmp("elm.text", part)) {
 		return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
 	}
 
@@ -265,16 +268,12 @@ static Evas_Object *_gl_title_content_get(void *data, Evas_Object *obj, const ch
 
 	DBG(LOG_INFO, "Title content- %s", part);
 
-	if (!g_strcmp0(part, "elm.icon")) {
-		if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) {
-			progressbar = elm_progressbar_add(obj);
-			elm_object_style_set(progressbar, "process_small");
-			elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
-			elm_progressbar_pulse(progressbar, EINA_TRUE);
-			evas_object_show(progressbar);
-		} else {
-			return NULL;
-		}
+	if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) {
+		progressbar = elm_progressbar_add(obj);
+		elm_object_style_set(progressbar, "process_small");
+		elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
+		elm_progressbar_pulse(progressbar, EINA_TRUE);
+		evas_object_show(progressbar);
 	}
 
 	__FUNC_EXIT__;
@@ -305,7 +304,7 @@ static char *_gl_peer_label_get(void *data, Evas_Object *obj, const char *part)
 		return NULL;
 	}
 
-	if (!g_strcmp0(part, "elm.text.main.left.top")) {
+	if (!strcmp("elm.text", part)) {
 		if (strlen(peer->ssid) != 0) {
 			ssid = elm_entry_utf8_to_markup(peer->ssid);
 			if (NULL == ssid) {
@@ -316,7 +315,7 @@ static char *_gl_peer_label_get(void *data, Evas_Object *obj, const char *part)
 			__FUNC_EXIT__;
 			return ssid;
 		}
-	} else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) {
+	} else if (!strcmp("elm.text.sub", part)) {
 		switch (peer->conn_status) {
 		case PEER_CONN_STATUS_DISCONNECTED:
 			g_strlcpy(buf, _("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH);
@@ -372,21 +371,9 @@ static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object *obj, const char *
 		return NULL;
 	}
 	DBG(LOG_INFO, "part = %s", part);
-	if (!g_strcmp0(part, "elm.icon.2")) {
-		DBG(LOG_INFO, "elm.icon.2 - connection status [%d]\n", peer->conn_status);
-		if (peer->conn_status == PEER_CONN_STATUS_CONNECTING) {
-			layout = elm_layout_add(obj);
-			elm_layout_theme_set(layout, "layout", "list/C/type.2", "default");
-			icon = elm_progressbar_add(layout);
-			elm_object_style_set(icon, "process_medium");
-			elm_progressbar_pulse(icon, EINA_TRUE);
-		} else if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
-			return NULL;
-		}
-		evas_object_show(icon);
-		elm_layout_content_set(layout, "elm.swallow.content", icon);
-	} else if (!g_strcmp0(part, "elm.icon.1")) {
-		DBG(LOG_INFO, "elm.icon.1 - category [%d]\n", peer->category);
+
+	if (!strcmp("elm.swallow.icon", part)) {
+		DBG(LOG_INFO, "elm.swallow.icon - category [%d]\n", peer->category);
 		char *img_name = NULL;
 		layout = elm_layout_add(obj);
 		elm_layout_theme_set(layout, "layout", "list/B/type.3", "default");
@@ -449,14 +436,28 @@ static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object *obj, const char *
 		elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
 		evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 		evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-		ea_theme_object_color_set(icon, "AO001");
+		evas_object_color_set(icon, 2, 61, 132, 204);
 		evas_object_show(icon);
 		evas_object_propagate_events_set(icon, EINA_FALSE);
 		elm_layout_content_set(layout, "elm.swallow.content", icon);
+	} else if (!strcmp("elm.swallow.end", part)) {
+		DBG(LOG_INFO, "elm.icon.2 - connection status [%d]\n", peer->conn_status);
+		if (peer->conn_status == PEER_CONN_STATUS_CONNECTING) {
+			layout = elm_layout_add(obj);
+			elm_layout_theme_set(layout, "layout", "list/C/type.2", "default");
+			icon = elm_progressbar_add(layout);
+			elm_object_style_set(icon, "process_medium");
+			elm_progressbar_pulse(icon, EINA_TRUE);
+		} else if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) {
+			return NULL;
+		}
+		evas_object_show(icon);
+		elm_layout_content_set(layout, "elm.swallow.content", icon);
 	}
 
 	if (layout)
 		evas_object_show(layout);
+
 	__FUNC_EXIT__;
 	return layout;
 }
@@ -481,9 +482,10 @@ static Evas_Object *_gl_conn_peer_icon_get(void *data, Evas_Object *obj, const c
 		DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
 		return NULL;
 	}
+
 	DBG(LOG_INFO, "part[%s]\n", part);
-	if (!g_strcmp0(part, "elm.icon.1")) {
-		DBG(LOG_INFO, "elm.icon.1 - category [%d]\n", peer->category);
+	if (!strcmp("elm.swallow.icon", part)) {
+		DBG(LOG_INFO, "elm.swallow.icon - category [%d]\n", peer->category);
 		char *img_name = NULL;
 		layout = elm_layout_add(obj);
 		elm_layout_theme_set(layout, "layout", "list/B/type.3", "default");
@@ -546,13 +548,15 @@ static Evas_Object *_gl_conn_peer_icon_get(void *data, Evas_Object *obj, const c
 		elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
 		evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 		evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-		ea_theme_object_color_set(icon, "AO001");
+		evas_object_color_set(icon, 2, 61, 132, 204);
 		evas_object_show(icon);
 		evas_object_propagate_events_set(icon, EINA_FALSE);
 		elm_layout_content_set(layout, "elm.swallow.content", icon);
 	}
+
 	if (layout)
 		evas_object_show(layout);
+
 	__FUNC_EXIT__;
 	return layout;
 }
@@ -574,7 +578,7 @@ static char *_gl_noitem_text_get(void *data, Evas_Object *obj, const char *part)
 	}
 
 	DBG(LOG_INFO,"part = %s",part);
-	if (!g_strcmp0(part, "elm.text.main.left")) {
+	if (!strcmp("elm.text", part)) {
 		return g_strdup(_("IDS_BT_BODY_NO_DEVICES_FOUND_ABB"));
 	}
 	__FUNC_EXIT__;
@@ -597,7 +601,7 @@ static char *_gl_conn_dev_title_label_get(void *data, Evas_Object *obj, const ch
 		return NULL;
 	}
 	DBG(LOG_INFO,"part = %s",part);
-	if (!g_strcmp0(part, "elm.text.main")) {
+	if (!strcmp("elm.text", part)) {
 		return g_strdup(_("IDS_ST_HEADER_CONNECTED_DEVICES"));
 	}
 
@@ -635,16 +639,14 @@ static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const cha
 	DBG(LOG_INFO, "%s", part);
 	char *det = NULL;
 	char *buf = NULL;
-	char *str = NULL;
 	char *ssid;
-	int r = 0, g = 0, b = 0, a = 0;
 
 	if (data == NULL) {
 		DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
 		return NULL;
 	}
 
-	if (!g_strcmp0(part, "elm.text.main.left.top")) {
+	if (!strcmp("elm.text", part)) {
 		if (strlen(peer->ssid) != 0) {
 			ssid = elm_entry_utf8_to_markup(peer->ssid);
 			if (NULL == ssid) {
@@ -655,20 +657,13 @@ static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const cha
 			__FUNC_EXIT__;
 			return ssid;
 		}
-	} else if(!g_strcmp0(part, "elm.text.sub.left.bottom")){
+	} else if (!strcmp("elm.text.sub", part)) {
 		det = elm_entry_utf8_to_markup(_("IDS_COM_BODY_CONNECTED_M_STATUS"));
-		ea_theme_color_get("T024S",&r, &g, &b, &a,
-			NULL, NULL, NULL, NULL,
-			NULL, NULL, NULL, NULL);
-		str = ConvertRGBAtoHex(r, g, b, a);
 		buf = g_strdup_printf("<color=#%s>%s</color>",
-			str, det);
+			ConvertRGBAtoHex(2, 61, 132, 255), det);
 		if (det != NULL) {
 			g_free(det);
 		}
-		if (str != NULL) {
-			g_free(str);
-		}
 		__FUNC_EXIT__;
 		return buf;
 	}
@@ -693,7 +688,7 @@ static char *_gl_conn_failed_dev_title_label_get(void *data, Evas_Object *obj,
 		return NULL;
 	}
 
-	if (!g_strcmp0(part, "elm.text")) {
+	if (!strcmp("elm.text", part)) {
 		return g_strdup(_("IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB"));
 	}
 
@@ -724,7 +719,7 @@ static char *_gl_peer_conn_failed_dev_label_get(void *data, Evas_Object *obj, co
 		return NULL;
 	}
 
-	if (!g_strcmp0(part, "elm.text.1")) {
+	if (!strcmp("elm.text", part)) {
 		if (strlen(peer->ssid) != 0) {
 			ssid = elm_entry_utf8_to_markup(peer->ssid);
 			if (NULL == ssid) {
@@ -735,7 +730,7 @@ static char *_gl_peer_conn_failed_dev_label_get(void *data, Evas_Object *obj, co
 			__FUNC_EXIT__;
 			return ssid;
 		}
-	} else {
+	} else if (!strcmp("elm.text.sub", part)) {
 		g_strlcpy(buf, _("IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"),
 			WFD_GLOBALIZATION_STR_LENGTH);
 		__FUNC_EXIT__;
@@ -762,7 +757,7 @@ static char *_gl_multi_connect_dev_title_label_get(void *data, Evas_Object *obj,
 	}
 	DBG(LOG_INFO, "%s", part);
 
-	if (!g_strcmp0(part, "elm.text.main")) {
+	if (!strcmp("elm.text", part)) {
 		if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
 			return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
 		} else if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED) {
@@ -791,7 +786,7 @@ static char *_gl_multi_connect_select_all_title_label_get(void *data, Evas_Objec
 	}
 	DBG(LOG_INFO, "%s", part);
 
-	if (!g_strcmp0(part, "elm.text.main.left")) {
+	if (!strcmp("elm.text", part)) {
 		__FUNC_EXIT__;
 		return g_strdup(_("IDS_WIFI_BODY_SELECT_ALL"));
 	}
@@ -816,7 +811,7 @@ static Evas_Object *_wfd_gl_select_all_icon_get(void *data, Evas_Object *obj, co
 
 	DBG(LOG_INFO, "Part %s", part);
 
-	if (!g_strcmp0(part, "elm.icon.2")) {
+	if (!strcmp("elm.swallow.end", part)) {
 		icon_layout = elm_layout_add(obj);
 		elm_layout_theme_set(icon_layout, "layout", "list/C/type.2", "default");
 		DBG(LOG_INFO, "Part %s", part);
@@ -853,7 +848,7 @@ static char *_gl_busy_dev_title_label_get(void *data, Evas_Object *obj,
 	}
 	DBG(LOG_INFO, "%s", part);
 
-	if (!g_strcmp0(part,"elm.text.main")) {
+	if (!strcmp("elm.text", part)) {
 		return g_strdup(_("IDS_ST_HEADER_BUSY_DEVICES"));
 	}
 
@@ -885,7 +880,7 @@ static char *_gl_peer_busy_dev_label_get(void *data, Evas_Object *obj, const cha
 
 	DBG(LOG_INFO, "peer->ssid = %s", peer->ssid);
 
-	if (!g_strcmp0(part, "elm.text.main.left.top")) {
+	if (!strcmp("elm.text", part)) {
 		if (strlen(peer->ssid) != 0) {
 			ssid = elm_entry_utf8_to_markup(peer->ssid);
 			if (NULL == ssid) {
@@ -896,14 +891,14 @@ static char *_gl_peer_busy_dev_label_get(void *data, Evas_Object *obj, const cha
 			__FUNC_EXIT__;
 			return ssid;
 		}
-	} else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) {
+	} else if (!strcmp("elm.text.sub", part)) {
 		g_strlcpy(buf, _("IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"),
 			WFD_GLOBALIZATION_STR_LENGTH);
 		__FUNC_EXIT__;
 		return g_strdup(buf);
 	}
-	return NULL;
 
+	return NULL;
 }
 
 /**
@@ -931,99 +926,98 @@ void initialize_gen_item_class()
 {
 	elm_theme_extension_add(NULL, WFD_UG_EDJ_PATH);
 
-	device_name_itc.item_style = "dialogue/2text.2";
-	device_name_itc.func.text_get = NULL;
+	device_name_itc.item_style = WFD_GENLIST_MULTILINE_TEXT_STYLE;
+	device_name_itc.func.text_get = _gl_device_name_label_get;
 	device_name_itc.func.content_get = NULL;
 	device_name_itc.func.state_get = NULL;
 
 #ifdef WFD_ON_OFF_GENLIST
-	wfd_onoff_itc.item_style = "2line.bottom";
+	wfd_onoff_itc.item_style = WFD_GENLIST_2LINE_BOTTOM_TEXT_ICON_STYLE;
 	wfd_onoff_itc.func.text_get = _gl_wfd_onoff_text_get;
 	wfd_onoff_itc.func.content_get = _gl_wfd_onoff_content_get;
 	wfd_onoff_itc.func.state_get = NULL;
 	wfd_onoff_itc.func.del = NULL;
 #endif
 
-
-	title_itc.item_style = "groupindex";
+	title_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE;
 	title_itc.func.text_get = _gl_title_label_get;
 	title_itc.func.content_get = _gl_title_content_get;
 	title_itc.func.state_get = NULL;
 	title_itc.func.del = NULL;
 
-	multi_view_title_itc.item_style = "groupindex";
+	multi_view_title_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE;
 	multi_view_title_itc.func.text_get = _gl_multi_title_label_get;
 	multi_view_title_itc.func.content_get = _gl_multi_title_content_get;
 	multi_view_title_itc.func.state_get = NULL;
 	multi_view_title_itc.func.del = NULL;
 
-	title_no_device_itc.item_style = "groupindex";
+	title_no_device_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE;
 	title_no_device_itc.func.text_get = _gl_title_no_device_label_get;
 	title_no_device_itc.func.content_get = NULL;
 	title_no_device_itc.func.state_get = NULL;
 	title_no_device_itc.func.del = NULL;
 
-	title_available_itc.item_style = "groupindex";
+	title_available_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE;
 	title_available_itc.func.text_get = _gl_available_title_label_get;
 	title_available_itc.func.content_get = _gl_title_content_get;
 	title_available_itc.func.state_get = NULL;
 	title_available_itc.func.del = NULL;
 
-	peer_itc.item_style = "2line.top";
+	peer_itc.item_style = WFD_GENLIST_2LINE_TOP_TEXT_ICON_STYLE;
 	peer_itc.func.text_get = _gl_peer_label_get;
 	peer_itc.func.content_get = _gl_peer_icon_get;
 	peer_itc.func.state_get = NULL;
 	peer_itc.func.del = _gl_peer_del;
 
-	noitem_itc.item_style = "1line";
+	noitem_itc.item_style = WFD_GENLIST_1LINE_TEXT_STYLE;
 	noitem_itc.func.text_get = _gl_noitem_text_get;
 	noitem_itc.func.content_get = NULL;
 	noitem_itc.func.state_get = NULL;
 	noitem_itc.func.del = NULL;
 
-	title_conn_itc.item_style = "groupindex";
+	title_conn_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE;
 	title_conn_itc.func.text_get = _gl_conn_dev_title_label_get;
 	title_conn_itc.func.content_get = NULL;
 	title_conn_itc.func.state_get = NULL;
 	title_conn_itc.func.del = NULL;
 
-	peer_conn_itc.item_style = "2line.top";
+	peer_conn_itc.item_style = WFD_GENLIST_2LINE_TOP_TEXT_ICON_STYLE;
 	peer_conn_itc.func.text_get = _gl_peer_conn_dev_label_get;
 	peer_conn_itc.func.content_get = _gl_conn_peer_icon_get;
 	peer_conn_itc.func.state_get = NULL;
 	peer_conn_itc.func.del = _gl_peer_del;
 
-	title_conn_failed_itc.item_style = "dialogue/title";
+	title_conn_failed_itc.item_style = WFD_GENLIST_1LINE_TEXT_STYLE;
 	title_conn_failed_itc.func.text_get = _gl_conn_failed_dev_title_label_get;
 	title_conn_failed_itc.func.content_get = NULL;
 	title_conn_failed_itc.func.state_get = NULL;
 	title_conn_failed_itc.func.del = NULL;
 
-	peer_conn_failed_itc.item_style = "dialogue/2text.2icon.3";
+	peer_conn_failed_itc.item_style = WFD_GENLIST_2LINE_TOP_TEXT_ICON_STYLE;
 	peer_conn_failed_itc.func.text_get = _gl_peer_conn_failed_dev_label_get;
 	peer_conn_failed_itc.func.content_get = _gl_peer_icon_get;
 	peer_conn_failed_itc.func.state_get = NULL;
 	peer_conn_failed_itc.func.del = _gl_peer_del;
 
-	title_busy_itc.item_style = "groupindex";
+	title_busy_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE;
 	title_busy_itc.func.text_get = _gl_busy_dev_title_label_get;
 	title_busy_itc.func.content_get = NULL;
 	title_busy_itc.func.state_get = NULL;
 	title_busy_itc.func.del = NULL;
 
-	peer_busy_itc.item_style = "2line.top";
+	peer_busy_itc.item_style = WFD_GENLIST_2LINE_TOP_TEXT_ICON_STYLE;
 	peer_busy_itc.func.text_get = _gl_peer_busy_dev_label_get;
 	peer_busy_itc.func.content_get = _gl_peer_icon_get;
 	peer_busy_itc.func.state_get = NULL;
 	peer_busy_itc.func.del = _gl_peer_del;
 
-	title_multi_connect_itc.item_style = "groupindex";
+	title_multi_connect_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE;
 	title_multi_connect_itc.func.text_get = _gl_multi_connect_dev_title_label_get;
 	title_multi_connect_itc.func.content_get = NULL;
 	title_multi_connect_itc.func.state_get = NULL;
 	title_multi_connect_itc.func.del = NULL;
 
-	select_all_multi_connect_itc.item_style = "1line";
+	select_all_multi_connect_itc.item_style = WFD_GENLIST_1LINE_TEXT_ICON_STYLE;
 	select_all_multi_connect_itc.func.text_get =
 		_gl_multi_connect_select_all_title_label_get;
 	select_all_multi_connect_itc.func.content_get = _wfd_gl_select_all_icon_get;
diff --git a/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c
index dfe5b73..2a1b25c 100644..100755
--- a/ug-wifidirect/src/wfd_ug_main_view.c
+++ b/ug-wifidirect/src/wfd_ug_main_view.c
@@ -26,6 +26,7 @@
 #include <ui-gadget-module.h>
 #include <app_control.h>
 #include <wifi-direct.h>
+#include <efl_extension.h>
 
 #include "wfd_ug.h"
 #include "wfd_ug_view.h"
@@ -35,20 +36,26 @@ void scan_button_create(struct ug_data *ugd)
 {
 	__FUNC_ENTER__;
 
-	Evas_Object *btn;
-	btn = elm_button_add(ugd->layout);
-	/* Use "bottom" style button */
+	Evas_Object *btn_ly = NULL;
+	Evas_Object *btn = NULL;
+
+	btn_ly = elm_layout_add(ugd->layout);
+	elm_layout_file_set(btn_ly, WFD_UG_EDJ_PATH, "bottom_btn");
+	ugd->button_layout = btn_ly;
+
+	btn = elm_button_add(ugd->button_layout);
 	elm_object_style_set(btn, "bottom");
 	elm_object_domain_translatable_text_set(btn, PACKAGE, "IDS_WIFI_SK4_SCAN");
-	ugd->scan_toolbar = btn;
 	if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
-		wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK4_SCAN",
+		wfd_ug_view_refresh_button(btn, "IDS_WIFI_SK4_SCAN",
 			FALSE);
 	}
 	evas_object_smart_callback_add(btn, "clicked",_scan_btn_cb, (void *)ugd);
-	/* Set button into "toolbar" swallow part */
-	elm_object_part_content_set(ugd->layout, "button.big", btn);
-	evas_object_show(ugd->scan_toolbar);
+	elm_layout_content_set(ugd->button_layout, "button.big", btn);
+	ugd->scan_toolbar = btn;
+
+	elm_object_part_content_set(ugd->naviframe, "toolbar", ugd->button_layout);
+	evas_object_show(ugd->button_layout);
 
 	__FUNC_EXIT__;
 }
@@ -222,7 +229,6 @@ void _scan_btn_cb(void *data, Evas_Object *obj, void *event_info)
 	int ret = -1;
 	const char *btn_text = NULL;
 	btn_text = elm_object_part_text_get(ugd->scan_toolbar, "default");
-	WFD_RET_IF(btn_text == NULL, "The btn_text is NULL\n");
 	DBG(LOG_INFO, "Button text=%s",btn_text);
 
 	if (!g_strcmp0(elm_object_text_get(obj), _("IDS_WIFI_SK4_SCAN"))) {
@@ -363,11 +369,10 @@ static void _gl_peer_sel(void *data, Evas_Object *obj, void *event_info)
 
 	if (ugd->disconnect_btn) {
 		Evas_Object *content;
-		content = elm_object_part_content_unset(ugd->layout, "button.next");
+		content = elm_object_part_content_unset(ugd->button_layout, "button.next");
 		WFD_IF_DEL_OBJ(content);
 		ugd->disconnect_btn = NULL;
-		elm_object_part_content_set(ugd->layout, "button.big",
-			ugd->scan_toolbar);
+		elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar);
 	}
 
 	if (item) {
@@ -562,8 +567,8 @@ void _more_button_cb(void *data, Evas_Object *obj, void *event_info)
 
 	ugd->ctxpopup = elm_ctxpopup_add(naviframe);
 	elm_object_style_set(ugd->ctxpopup, "more/default");
-	ea_object_event_callback_add(ugd->ctxpopup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, NULL);
-	ea_object_event_callback_add(ugd->ctxpopup, EA_CALLBACK_MORE, ea_ctxpopup_back_cb, NULL);
+	eext_object_event_callback_add(ugd->ctxpopup, EEXT_CALLBACK_BACK, eext_ctxpopup_back_cb, NULL);
+	eext_object_event_callback_add(ugd->ctxpopup, EEXT_CALLBACK_MORE, eext_ctxpopup_back_cb, NULL);
 	evas_object_smart_callback_add(ugd->ctxpopup, "dismissed", ctxpopup_dismissed_cb, ugd);
 	elm_ctxpopup_auto_hide_disabled_set(ugd->ctxpopup, EINA_TRUE);
 
@@ -923,7 +928,7 @@ static Evas_Object *_create_basic_genlist(void *data)
 	Evas_Object *genlist;
 
 	genlist = elm_genlist_add(ugd->layout);
-	elm_genlist_homogeneous_set(genlist, EINA_TRUE);
+
 	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 	evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND,
 			EVAS_HINT_EXPAND);
@@ -1256,64 +1261,63 @@ void wfd_ug_update_toolbar(struct ug_data *ugd)
 	Evas_Object *btn;
 
 	wfd_refresh_wifi_direct_state(ugd);
-		if (ugd->wfd_status == WIFI_DIRECT_STATE_CONNECTING) {
-			DBG(LOG_INFO, "WIFI_DIRECT_STATE_CONNECTING\n");
-			if( ugd->multi_connect_wfd_item != NULL) {
-				DBG(LOG_INFO, "multi_connect_toolbar_item\n");
-				btn = elm_button_add(ugd->layout);
-				/* Use "bottom" style button */
-				elm_object_style_set(btn, "bottom");
-				elm_object_domain_translatable_text_set(btn, PACKAGE,
-						"IDS_WIFI_SK2_CANCEL_CONNECTION");
-				evas_object_smart_callback_add(btn, "clicked",
+	if (ugd->wfd_status == WIFI_DIRECT_STATE_CONNECTING) {
+		DBG(LOG_INFO, "WIFI_DIRECT_STATE_CONNECTING\n");
+		if( ugd->multi_connect_wfd_item != NULL) {
+			DBG(LOG_INFO, "multi_connect_toolbar_item\n");
+			btn = elm_button_add(ugd->button_layout);
+			/* Use "bottom" style button */
+			elm_object_style_set(btn, "bottom");
+			elm_object_domain_translatable_text_set(btn, PACKAGE,
+					"IDS_WIFI_SK2_CANCEL_CONNECTION");
+			evas_object_smart_callback_add(btn, "clicked",
 					_wfd_ug_cancel_connection_button_cb, (void *)ugd);
-				/* Set button into "toolbar" swallow part */
-				elm_object_part_content_set(ugd->layout, "button.next", btn);
-				ugd->disconnect_btn = btn;
-				evas_object_show(ugd->disconnect_btn);
-				elm_object_part_content_set(ugd->layout, "button.prev",
-					ugd->scan_toolbar);
-				wfd_ug_view_refresh_button(ugd->scan_toolbar,
+			/* Set button into "toolbar" swallow part */
+			elm_object_part_content_set(ugd->button_layout, "button.next", btn);
+			ugd->disconnect_btn = btn;
+			evas_object_show(ugd->disconnect_btn);
+			elm_object_part_content_set(ugd->button_layout, "button.prev",
+				ugd->scan_toolbar);
+			wfd_ug_view_refresh_button(ugd->scan_toolbar,
 					"IDS_WIFI_SK4_SCAN", FALSE);
-				evas_object_data_set(ugd->disconnect_btn, "multi", "disconnect");
-				DBG(LOG_INFO, "button: disconnect button added\n");
-			} else {
-				DBG(LOG_INFO, "scan_toolbar\n");
-				WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item);
-				wfd_ug_view_refresh_button(ugd->scan_toolbar,
+			evas_object_data_set(ugd->disconnect_btn, "multi", "disconnect");
+			DBG(LOG_INFO, "button: disconnect button added\n");
+		} else {
+			DBG(LOG_INFO, "scan_toolbar\n");
+			WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item);
+			wfd_ug_view_refresh_button(ugd->scan_toolbar,
 					"IDS_WIFI_SK2_CANCEL_CONNECTION", TRUE);
-				evas_object_data_set(ugd->scan_btn, "multi", "cancel");
-				DBG(LOG_INFO, "button: stop connect button added\n");
-			}
-		} else if (no_of_conn_dev > 0) {
+			evas_object_data_set(ugd->scan_btn, "multi", "cancel");
+			DBG(LOG_INFO, "button: stop connect button added\n");
+		}
+	} else if (no_of_conn_dev > 0) {
 		if (!ugd->multi_connect_toolbar_item) {
-			btn = elm_button_add(ugd->layout);
+			btn = elm_button_add(ugd->button_layout);
 			/* Use "bottom" style button */
 			elm_object_style_set(btn, "bottom");
 			elm_object_domain_translatable_text_set(btn, PACKAGE,
 					"IDS_WIFI_SK_DISCONNECT");
 			evas_object_smart_callback_add(btn, "clicked",
-				_wfd_ug_disconnect_button_cb, (void *)ugd);
+					_wfd_ug_disconnect_button_cb, (void *)ugd);
 			/* Set button into "toolbar" swallow part */
-			elm_object_part_content_set(ugd->layout, "button.next", btn);
+			elm_object_part_content_set(ugd->button_layout, "button.next", btn);
 			ugd->disconnect_btn = btn;
 			evas_object_show(ugd->disconnect_btn);
 		}
-		elm_object_part_content_set(ugd->layout, "button.prev",
-			ugd->scan_toolbar);
+		elm_object_part_content_set(ugd->button_layout, "button.prev",
+				ugd->scan_toolbar);
 		wfd_ug_view_refresh_button(ugd->scan_toolbar,
-			"IDS_WIFI_SK4_SCAN", TRUE);
+				"IDS_WIFI_SK4_SCAN", TRUE);
 		evas_object_data_set(ugd->disconnect_btn, "multi", "disconnect");
 		DBG(LOG_INFO, "button: disconnect button added\n");
-	}else {
+	} else {
 		if (no_of_conn_dev == 0 && ugd->disconnect_btn != NULL) {
 			DBG(LOG_INFO, "disconnect btn removed when conn failed\n");
 			Evas_Object *content;
-			content = elm_object_part_content_unset(ugd->layout, "button.next");
+			content = elm_object_part_content_unset(ugd->button_layout, "button.next");
 			WFD_IF_DEL_OBJ(content);
 			ugd->disconnect_btn = NULL;
-			elm_object_part_content_set(ugd->layout, "button.big",
-				ugd->scan_toolbar);
+			elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar);
 		}
 		wfd_ug_view_refresh_button(ugd->scan_toolbar,
 			"IDS_WIFI_SK4_SCAN", TRUE);
@@ -1448,8 +1452,6 @@ Elm_Object_Item *get_insert_postion(device_type_s *peer, Elm_Object_Item *pre_it
 	}
 
 	peer_ite = (device_type_s *)elm_object_item_data_get(head);
-	WFD_RETV_IF(peer_ite == NULL, NULL, "peer_ite is NULL\n");
-
 	if(peer_ite->gl_item != NULL) {
 		for(i=0; i < peer_cnt; i++) {
 			if (strcasecmp(peer_ite->ssid, peer->ssid) > 0) {
@@ -1809,11 +1811,11 @@ void _onoff_changed_cb(void *data, Evas_Object *obj, void *event_info)
 	elm_object_disabled_set(ugd->on_off_check, TRUE);
 	if(ugd->disconnect_btn) {
 		Evas_Object *content;
-		content = elm_object_part_content_unset(ugd->layout, "button.next");
+		content = elm_object_part_content_unset(ugd->button_layout, "button.next");
 		WFD_IF_DEL_OBJ(content);
 		ugd->disconnect_btn = NULL;
 	}
-	elm_object_part_content_set(ugd->layout, "button.big", ugd->scan_toolbar);
+	elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar);
 
 	/* turn on/off wfd */
 	if (!ugd->wfd_onoff) {
@@ -1887,23 +1889,26 @@ void create_wfd_ug_view(void *data)
 	__FUNC_ENTER__;
 	struct ug_data *ugd = (struct ug_data *) data;
 	WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
+#ifdef TIZEN_WIFIDIRECT_MORE_BTN
 	Evas_Object *more_btn;
+#endif
 	Evas_Object *layout;
 
 	ugd->naviframe = elm_naviframe_add(ugd->base);
 	elm_naviframe_prev_btn_auto_pushed_set(ugd->naviframe, EINA_FALSE);
-	ea_object_event_callback_add(ugd->naviframe, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL);
-	ea_object_event_callback_add(ugd->naviframe, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL);
+	eext_object_event_callback_add(ugd->naviframe, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
+	eext_object_event_callback_add(ugd->naviframe, EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL);
 	elm_object_part_content_set(ugd->base, "elm.swallow.content", ugd->naviframe);
 
 	ugd->back_btn = elm_button_add(ugd->naviframe);
 	elm_object_style_set(ugd->back_btn, "naviframe/back_btn/default");
-//	evas_object_smart_callback_add(ugd->back_btn, "clicked", _back_btn_cb, (void *)ugd);
+	evas_object_smart_callback_add(ugd->back_btn, "clicked", _back_btn_cb, (void *)ugd);
 	elm_object_focus_allow_set(ugd->back_btn, EINA_FALSE);
 
 	/* Create layout */
 	layout = elm_layout_add(ugd->naviframe);
-	elm_layout_file_set(layout, WFD_UG_EDJ_PATH, "main_layout");
+	elm_layout_theme_set(layout, "layout", "application", "default");
+	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	ugd->layout = layout;
 
 	ugd->genlist = _create_basic_genlist(ugd);
@@ -1912,8 +1917,8 @@ void create_wfd_ug_view(void *data)
 		return;
 	}
 	elm_object_part_content_set(layout, "elm.swallow.content", ugd->genlist);
-
 	elm_genlist_fx_mode_set(ugd->genlist, EINA_FALSE);
+
 	evas_object_show(ugd->base);
 	elm_object_focus_set(ugd->base, EINA_TRUE);
 
@@ -1921,12 +1926,14 @@ void create_wfd_ug_view(void *data)
 			ugd->back_btn, NULL, layout, NULL);
 	elm_naviframe_item_pop_cb_set(ugd->navi_item, _back_btn_cb, ugd);
 
+#ifdef TIZEN_WIFIDIRECT_MORE_BTN
 	more_btn = elm_button_add(ugd->naviframe);
 	elm_object_style_set(more_btn, "naviframe/more/default");
 	evas_object_smart_callback_add(more_btn, "clicked",
 			_more_button_cb, ugd->win);
 	elm_object_item_part_content_set(ugd->navi_item, "toolbar_more_btn",
 			more_btn);
+#endif
 
 	wifi_direct_initialize();
 	wifi_direct_get_state(&ugd->wfd_status);
@@ -1968,6 +1975,8 @@ void destroy_wfd_ug_view(void *data)
 	WFD_IF_DEL_OBJ(ugd->back_btn);
 	WFD_IF_DEL_OBJ(ugd->toolbar);
 	WFD_IF_DEL_OBJ(ugd->genlist);
+	WFD_IF_DEL_OBJ(ugd->button_layout);
+	WFD_IF_DEL_OBJ(ugd->layout);
 	WFD_IF_DEL_OBJ(ugd->naviframe);
 	__FUNC_EXIT__;
 }
diff --git a/ug-wifidirect/src/wfd_ug_multiconnect_view.c b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
index ef36a62..41b1095 100644..100755
--- a/ug-wifidirect/src/wfd_ug_multiconnect_view.c
+++ b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
@@ -475,7 +475,7 @@ static char *_wfd_gl_device_label_get(void *data, Evas_Object *obj, const char *
 		return NULL;
 	}
 
-	if (!g_strcmp0(part, "elm.text.main.left")) {
+	if (!strcmp("elm.text", part)) {
 		if (strlen(peer->ssid) != 0) {
 			ssid = elm_entry_utf8_to_markup(peer->ssid);
 			if (NULL == ssid) {
@@ -556,10 +556,22 @@ static Evas_Object *_wfd_gl_device_icon_get(void *data, Evas_Object *obj, const
 	Evas_Object *icon = NULL;
 	Evas_Object *icon_layout = NULL;
 
-
 	DBG(LOG_INFO, "Part %s", part);
 
-	if (!g_strcmp0(part, "elm.icon.2")) {
+	if (!strcmp("elm.swallow.icon", part)) {
+		DBG(LOG_INFO, "Part %s", part);
+		icon_layout = elm_layout_add(obj);
+		elm_layout_theme_set(icon_layout, "layout", "list/B/type.3", "default");
+		img_name = __wfd_get_device_icon_path(peer);
+		icon = elm_image_add(icon_layout);
+		elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
+		evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
+		evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+		evas_object_color_set(icon, 2, 61, 132, 204);
+		evas_object_show(icon);
+		evas_object_propagate_events_set(icon, EINA_FALSE);
+		elm_layout_content_set(icon_layout, "elm.swallow.content", icon);
+	} else if (!strcmp("elm.swallow.end", part)) {
 		icon_layout = elm_layout_add(obj);
 		elm_layout_theme_set(icon_layout, "layout", "list/C/type.2", "default");
 		DBG(LOG_INFO, "Part %s", part);
@@ -572,21 +584,11 @@ static Evas_Object *_wfd_gl_device_icon_get(void *data, Evas_Object *obj, const
 		evas_object_smart_callback_add(icon,
 			"changed", _wfd_gl_multi_sel_cb, (void *)data);
 		elm_layout_content_set(icon_layout, "elm.swallow.content", icon);
-	}else if (!g_strcmp0(part, "elm.icon.1")) {
-		DBG(LOG_INFO, "Part %s", part);
-		icon_layout = elm_layout_add(obj);
-		elm_layout_theme_set(icon_layout, "layout", "list/B/type.3", "default");
-		img_name = __wfd_get_device_icon_path(peer);
-		icon = elm_image_add(icon_layout);
-		elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
-		evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
-		evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-		ea_theme_object_color_set(icon, "AO001");
-		evas_object_show(icon);
-		evas_object_propagate_events_set(icon, EINA_FALSE);
-		elm_layout_content_set(icon_layout, "elm.swallow.content", icon);
 	}
-	evas_object_show(icon_layout);
+
+	if (icon_layout)
+		evas_object_show(icon_layout);
+
 	return icon_layout;
 }
 
@@ -928,7 +930,7 @@ void wfd_create_multiconnect_view(struct ug_data *ugd)
 		return;
 	}
 
-	device_itc.item_style = "1line";
+	device_itc.item_style = WFD_GENLIST_1LINE_TEXT_ICON_STYLE;
 	device_itc.func.text_get = _wfd_gl_device_label_get;
 	device_itc.func.content_get = _wfd_gl_device_icon_get;
 	device_itc.func.state_get = NULL;
@@ -936,7 +938,7 @@ void wfd_create_multiconnect_view(struct ug_data *ugd)
 
 	/* Create layout */
 	layout = elm_layout_add(ugd->naviframe);
-	elm_layout_file_set(layout, WFD_UG_EDJ_PATH, "main_layout");
+	elm_layout_file_set(layout, WFD_UG_EDJ_PATH, "bottom_btn");
 	ugd->multiconn_layout = layout;
 
 
diff --git a/ug-wifidirect/src/wfd_ug_popup.c b/ug-wifidirect/src/wfd_ug_popup.c
index 83f038d..ec4465b 100755
--- a/ug-wifidirect/src/wfd_ug_popup.c
+++ b/ug-wifidirect/src/wfd_ug_popup.c
@@ -24,8 +24,9 @@
 #include <vconf.h>
 #include <ui-gadget-module.h>
 #include <wifi-direct.h>
-#include "utilX.h"
+#include <efl_extension.h>
 
+#include "utilX.h"
 #include "wfd_ug.h"
 #include "wfd_ug_view.h"
 #include "wfd_client.h"
@@ -313,7 +314,7 @@ gboolean _wfd_disconnect_idle_cb(gpointer user_data)
 		return FALSE;
 	}
 	Evas_Object *content;
-	content = elm_object_part_content_unset(ugd->layout, "button.next");
+	content = elm_object_part_content_unset(ugd->button_layout, "button.next");
 	WFD_IF_DEL_OBJ(content);
 
 	wfd_ug_view_init_genlist(ugd, true);
@@ -527,7 +528,7 @@ void wfd_ug_act_popup(void *data, const char *message, int popup_type)
 
 	popup = elm_popup_add(ugd->base);
 	elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
-	ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+	eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
 	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	elm_object_domain_translatable_part_text_set(popup, "title,text",
 			 PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
@@ -779,7 +780,7 @@ void wfd_ug_warn_popup(void *data, const char *message, int popup_type)
 
 	popup = elm_popup_add(ugd->base);
 	elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
-	ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+	eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
 	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	if (popup_type == POP_TYPE_MULTI_CONNECT_POPUP ||
 		popup_type == POP_TYPE_BUSY_DEVICE_POPUP) {
diff --git a/ug-wifidirect/src/wfd_ug_rename_popup.c b/ug-wifidirect/src/wfd_ug_rename_popup.c
index 7014fa5..8d088df 100644..100755
--- a/ug-wifidirect/src/wfd_ug_rename_popup.c
+++ b/ug-wifidirect/src/wfd_ug_rename_popup.c
@@ -20,6 +20,7 @@
 #include <Elementary.h>
 #include <vconf.h>
 #include <wifi-direct.h>
+#include <efl_extension.h>
 
 #include "wfd_ug.h"
 #include "wfd_ug_view.h"
@@ -237,6 +238,7 @@ static void _rename_entry_keydown_cb(void *data, Evas *e, Evas_Object *obj, void
 		elm_object_focus_set(entry, EINA_FALSE);
 	}
 }
+
 static char *__wfd_main_rename_desc_label_get(void *data, Evas_Object *obj,
 					      const char *part)
 {
@@ -247,8 +249,11 @@ static char *__wfd_main_rename_desc_label_get(void *data, Evas_Object *obj,
 		return NULL;
 	}
 
-	if (!strcmp(part, "elm.text.multiline")) {
-		return g_strdup(_("IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"));
+	if (!strcmp("elm.text.multiline", part)) {
+		char buf[WFD_GLOBALIZATION_STR_LENGTH] = {0, };
+		snprintf(buf, WFD_GLOBALIZATION_STR_LENGTH, "<font_size=30>%s</font_size>",
+			_("IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG"));
+		return g_strdup(buf);
 	}
 	__FUNC_EXIT__;
 	return NULL;
@@ -271,13 +276,16 @@ static Evas_Object *__wfd_main_rename_entry_icon_get(
 	if (!strcmp(part, "elm.icon.entry")) {
 
 		name_value = elm_entry_utf8_to_markup(ugd->dev_name);
-		entry = ea_editfield_add(obj, EA_EDITFIELD_SCROLL_SINGLELINE);
+		entry = elm_entry_add(obj);
+		elm_entry_single_line_set(entry, EINA_TRUE);
+		elm_object_style_set(entry, "editfield");
+		elm_entry_scrollable_set(entry, EINA_TRUE);
 		limit_filter_data.max_char_count = WSC_SPEC_DEVICE_NAME_MAX_LEN;
 		elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter_data);
 
 		evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
-		ea_entry_selection_back_event_allow_set(entry, EINA_TRUE);
+		eext_entry_selection_back_event_allow_set(entry, EINA_TRUE);
 		elm_object_signal_emit(entry, "elm,action,hide,search_icon", "");
 		elm_object_domain_translatable_part_text_set(entry, "elm.guide",
 				 PACKAGE, "IDS_STU_HEADER_ENTER_DEVICE_NAME");
@@ -340,9 +348,9 @@ void _gl_rename_device_sel(void *data, Evas_Object *obj, void *event_info)
 	Evas_Object *layout = NULL;
 	Elm_Object_Item *git = NULL;
 
-	popup = elm_popup_add(ugd->layout);
-//	elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
-	ea_object_event_callback_add(popup, EA_CALLBACK_BACK, _rename_popup_cancel_cb, ugd);
+	popup = elm_popup_add(ugd->base);
+	elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+	eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _rename_popup_cancel_cb, ugd);
 	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	elm_object_domain_translatable_part_text_set(popup, "title,text",
 			 PACKAGE, "IDS_ST_HEADER_RENAME_DEVICE");
@@ -360,29 +368,31 @@ void _gl_rename_device_sel(void *data, Evas_Object *obj, void *event_info)
 
 	/* Entry genlist item */
 	ugd->rename_entry_itc = elm_genlist_item_class_new();
-	WFD_RET_IF(ugd->rename_entry_itc == NULL, "rename_entry_itc is NULL\n");
-	ugd->rename_entry_itc->item_style = "entry";
-	ugd->rename_entry_itc->func.text_get = NULL;
-	ugd->rename_entry_itc->func.content_get = __wfd_main_rename_entry_icon_get;
-	ugd->rename_entry_itc->func.state_get = NULL;
-	ugd->rename_entry_itc->func.del = NULL;
-
-	elm_genlist_item_append(genlist, ugd->rename_entry_itc, ugd,
-			NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+	if(ugd->rename_entry_itc != NULL) {
+		ugd->rename_entry_itc->item_style = "entry";
+		ugd->rename_entry_itc->func.text_get = NULL;
+		ugd->rename_entry_itc->func.content_get = __wfd_main_rename_entry_icon_get;
+		ugd->rename_entry_itc->func.state_get = NULL;
+		ugd->rename_entry_itc->func.del = NULL;
+
+		elm_genlist_item_append(genlist, ugd->rename_entry_itc, ugd,
+				NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+	}
 
 	ugd->rename_desc_itc = elm_genlist_item_class_new();
-	WFD_RET_IF(ugd->rename_desc_itc == NULL, "rename_desc_itc is NULL\n");
-	ugd->rename_desc_itc->item_style = "multiline_sub";
-	ugd->rename_desc_itc->func.text_get = __wfd_main_rename_desc_label_get;
-	ugd->rename_desc_itc->func.content_get = NULL;
-	ugd->rename_desc_itc->func.state_get = NULL;
-	ugd->rename_desc_itc->func.del = NULL;
-
-	git = elm_genlist_item_append(genlist, ugd->rename_desc_itc, NULL, NULL,
-			ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	if(git != NULL)
-		elm_genlist_item_select_mode_set(git,
-					 ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+	if(ugd->rename_desc_itc != NULL) {
+		ugd->rename_desc_itc->item_style = WFD_GENLIST_MULTILINE_TEXT_STYLE;
+		ugd->rename_desc_itc->func.text_get = __wfd_main_rename_desc_label_get;
+		ugd->rename_desc_itc->func.content_get = NULL;
+		ugd->rename_desc_itc->func.state_get = NULL;
+		ugd->rename_desc_itc->func.del = NULL;
+
+		git = elm_genlist_item_append(genlist, ugd->rename_desc_itc, NULL, NULL,
+				ELM_GENLIST_ITEM_NONE, NULL, NULL);
+		if(git != NULL)
+			elm_genlist_item_select_mode_set(git,
+						 ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+	}
 
 	button = elm_button_add(popup);
 	elm_object_style_set(button, "popup");
@@ -398,7 +408,6 @@ void _gl_rename_device_sel(void *data, Evas_Object *obj, void *event_info)
 	elm_object_part_content_set(popup, "button2", button);
 	evas_object_smart_callback_add(button, "clicked", _rename_popup_ok_cb, ugd);
 	ugd->rename_button = button;
-	evas_object_show(button);
 
 	elm_genlist_realization_mode_set(genlist, EINA_TRUE);
 	evas_object_show(genlist);
@@ -408,7 +417,6 @@ void _gl_rename_device_sel(void *data, Evas_Object *obj, void *event_info)
 	evas_object_show(popup);
 	elm_object_focus_set(ugd->rename_entry, EINA_TRUE);
 	ugd->rename_popup = popup;
-	evas_object_show(button);
 
 	__FUNC_EXIT__;
 }