diff --git a/src/e_mod_config.c b/src/e_mod_config.c
index 9a0fcd3..c54180d 100644
--- a/src/e_mod_config.c
+++ b/src/e_mod_config.c
@@ -39,7 +39,7 @@ _config_forecasts_module(Config_Item * ci)
 	    e_module_dir_get(forecasts_config->module));
   con = e_container_current_get(e_manager_current_get());
   cfd =
-    e_config_dialog_new(con, D_("Forecasts Configuration"), "Forecasts", "_e_modules_forecasts_config_dialog", buf, 0, v, ci);
+    e_config_dialog_new(con, D_("Forecasts Settings"), "Forecasts", "_e_modules_forecasts_config_dialog", buf, 0, v, ci);
   forecasts_config->config_dialog = cfd;
 }
 
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index c2c359c..0d4d70f 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -296,7 +296,7 @@ _forecasts_cb_mouse_down(void *data, Evas * e, Evas_Object * obj,
 	forecasts_config->menu = mn;
 
 	mi = e_menu_item_new(mn);
-	e_menu_item_label_set(mi, D_("Configuration"));
+	e_menu_item_label_set(mi, D_("Settings"));
 	e_util_menu_item_theme_icon_set(mi, "preferences-system");
 	e_menu_item_callback_set(mi, _forecasts_menu_cb_configure, inst);
 
@@ -988,7 +988,8 @@ _forecasts_popup_content_create(Instance *inst)
 
    evas = inst->popup->win->evas;
    o = e_widget_list_add(evas, 0, 0);
-   of = e_widget_frametable_add(evas, inst->location, 0);
+   snprintf(buf, sizeof(buf), "%s: Current Conditions", inst->location);
+   of = e_widget_frametable_add(evas, buf, 0);
 
    snprintf(buf, sizeof(buf), "%s: %d°%c", inst->condition.desc, inst->condition.temp, inst->units.temp);
    ob = e_widget_label_add(evas, buf);
@@ -1059,7 +1060,13 @@ _forecasts_popup_content_create(Instance *inst)
      {
 	int row = 0;
 
-	of = e_widget_frametable_add(evas, inst->forecast[i].date, 0);
+        if (!i)
+          snprintf (buf, sizeof(buf), "Today");
+        else if (i == 1)
+          snprintf (buf, sizeof(buf), "Tomorrow");
+        else
+          snprintf (buf, sizeof(buf), "%s", inst->forecast[i].date);
+	of = e_widget_frametable_add(evas, buf, 0);
 
 	ob = e_widget_label_add(evas, inst->forecast[i].desc);
 	e_widget_frametable_object_append(of, ob, 0, row, 3, 1, 0, 0, 1, 0);