diff --git a/build/mac/BuildNGLayoutDebug.pl b/build/mac/BuildNGLayoutDebug.pl
index cf8cce031bbf..55ce966d765b 100644
--- a/build/mac/BuildNGLayoutDebug.pl
+++ b/build/mac/BuildNGLayoutDebug.pl
@@ -35,12 +35,42 @@ $pull{netlib} = 0;
 $pull{nglayout} = 0;
 $pull{mac} = 0;
 
-$build{all} = 1;
+$build{all} = 0;
 $build{dist} = 0;
 $build{common}= 0;
 $build{nglayout}= 0;
 
 
+#
+# UI
+#
+
+@choices = ("pull_all", "build_all", "pull_and_build_all");
+
+  while (GetFrontProcess	() !=  GetCurrentProcess())
+  {
+	   SetFrontProcess( GetCurrentProcess() );
+  }
+	@pick = MacPerl::Pick("What would you like to do?", @choices);
+	$pull{all} = 0;
+	$build{all} = 1;
+	foreach $i (@pick)
+	{
+		if ($i eq "pull_all")
+		{
+			$pull{all} = 1;
+		}
+		elsif ($i eq "build_all")
+		{
+			$build{all} = 1;
+		}
+			elsif ($i eq "pull_and_build_all")
+		{
+			$build{all} = 1;
+			$pull{all} = 1;
+		}
+	}
+
 if ($pull{all})
 {
 	foreach $k (keys(%pull))
@@ -60,6 +90,7 @@ if ($build{all})
 # you should not have to edit anything bellow
 
 chdir("::::");
+$MOZ_SRC = cwd();
 
 Moz::StopForErrors();
 #Moz::DontStopForErrors();
@@ -67,8 +98,14 @@ Moz::StopForErrors();
 #OpenErrorLog("::NGLayoutBuildLog");
 OpenErrorLog(":::Mozilla.BuildLog");		# Tinderbox requires that name
 
+if ($pull{all}) { 
+   Checkout();
+}
+
+chdir($MOZ_SRC);
 BuildDist();
 
+chdir($MOZ_SRC);
 BuildProjects();
 
 print "Build layout complete\n";