--- citydlg.c.orig	Thu Dec  6 15:59:36 2001
+++ citydlg.c	Thu Dec  6 16:02:13 2001
@@ -94,7 +94,8 @@
     GtkWidget *map_canvas;
     GtkWidget *map_canvas_pixmap;
     GtkWidget *tradelist;
-    GtkWidget *currently_building_frame;
+    GtkWidget *currently_building_label;
+    GtkWidget *worklist_label;
     GtkWidget *progress_label;
     GtkWidget *improvement_list;
     GtkWidget *buy_command;
@@ -790,15 +791,20 @@
 
   /* stuff that's being currently built */
 
-  /* The label is set in city_dialog_update_building() */
-  pdialog->overview.currently_building_frame = gtk_frame_new("");
-  gtk_box_pack_start(GTK_BOX(vbox),
-		     pdialog->overview.currently_building_frame, FALSE,
-		     FALSE, 0);
 
   hbox = gtk_hbox_new(FALSE, 0);
-  gtk_container_add(GTK_CONTAINER
-		    (pdialog->overview.currently_building_frame), hbox);
+  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 1);
+
+  /* These labels are set in city_dialog_update_building() */
+  pdialog->overview.currently_building_label = gtk_label_new("");
+  gtk_box_pack_start(GTK_BOX(hbox), pdialog->overview.currently_building_label,
+		     FALSE, FALSE, 0);
+  pdialog->overview.worklist_label = gtk_label_new("");
+  gtk_box_pack_end(GTK_BOX(hbox), pdialog->overview.worklist_label, 
+		   FALSE, FALSE, 2);
+
+  hbox = gtk_hbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 1);
 
   pdialog->overview.progress_label = gtk_progress_bar_new();
   gtk_box_pack_start(GTK_BOX(hbox), pdialog->overview.progress_label,
@@ -1621,7 +1627,7 @@
 
   gtk_pixcomm_clear(GTK_PIXCOMM(pdialog->citizen_pixmap), TRUE);
 
-  i = 0;			/* tracks the # of the citizen we are currently placing. */
+  i = 0;	/* tracks the # of the citizen we are currently placing. */
   for (n = 0; n < pcity->ppl_happy[4]; n++, i++) {
     gtk_pixcomm_copyto(GTK_PIXCOMM(pdialog->citizen_pixmap),
 		       get_citizen_sprite(5 + i % 2), i * width, 0, TRUE);
@@ -1887,7 +1893,7 @@
 		pcity->shield_stock,
 		get_unit_type(pcity->currently_building)->build_cost,
 		turns);
-    my_snprintf(buf2, sizeof(buf2), "%s: %s", _("Currently building"),
+    my_snprintf(buf2, sizeof(buf2), "%s",
 		get_unit_type(pcity->currently_building)->name);
     pct =
 	(gfloat) pcity->shield_stock /
@@ -1918,12 +1924,14 @@
 	   0.1);
       pct = CLAMP(pct, 0.0, 1.0);
     }
-    my_snprintf(buf2, sizeof(buf2), "%s: %s", _("Currently building"),
+    my_snprintf(buf2, sizeof(buf2), "%s",
 		get_impr_name_ex(pcity, pcity->currently_building));
   }
 
-  gtk_frame_set_label(GTK_FRAME
-		      (pdialog->overview.currently_building_frame), buf2);
+  gtk_set_label(pdialog->overview.currently_building_label, buf2);
+  gtk_set_label(pdialog->overview.worklist_label, 
+		worklist_is_empty(pcity->worklist) ? "" : _("(worklist)"));
+  
   gtk_progress_set_percentage(GTK_PROGRESS
 			      (pdialog->overview.progress_label), pct);
   gtk_progress_set_format_string(GTK_PROGRESS