diff --git a/direct/src/gui/Button.py b/direct/src/gui/Button.py
index 177d266df8..58a68ea8d9 100644
--- a/direct/src/gui/Button.py
+++ b/direct/src/gui/Button.py
@@ -15,23 +15,34 @@ class Button(DirectObject):
         if (label == None):
             self.label = name
         else:
-            self.label = label
-        # up
-        self.l1 = GuiLabel.GuiLabel.makeSimpleTextLabel(self.label, font)
-        self.l1.setForegroundColor(0., 0., 0., 1.)
-        self.l1.thaw()
-        # roll-over up
-        self.l2 = GuiLabel.GuiLabel.makeSimpleTextLabel(self.label, font)
-        self.l2.setForegroundColor(0., 0., 0., 1.)
-        self.l2.setBackgroundColor(1., 1., 0., 1.)         
-        self.l2.thaw()
-        # roll-over down
-        self.l3 = GuiLabel.GuiLabel.makeSimpleTextLabel(self.label, font)
-        self.l3.setForegroundColor(1., 1., 1., 1.)
-        self.l3.setBackgroundColor(0., 0., 0., 1.)
-        self.l3.thaw()
+            # check to see if this is an actual guiLabel or just text
+            if (type(label) == type('')):
+                # text label, make text button
+                self.label = label
+                # up
+                self.l1 = GuiLabel.GuiLabel.makeSimpleTextLabel(self.label,
+                                                                font)
+                self.l1.setForegroundColor(0., 0., 0., 1.)
+                self.l1.thaw()
+                # roll-over up
+                self.l2 = GuiLabel.GuiLabel.makeSimpleTextLabel(self.label,
+                                                                font)
+                self.l2.setForegroundColor(0., 0., 0., 1.)
+                self.l2.setBackgroundColor(1., 1., 0., 1.)         
+                self.l2.thaw()
+                # roll-over down
+                self.l3 = GuiLabel.GuiLabel.makeSimpleTextLabel(self.label,
+                                                                font)
+                self.l3.setForegroundColor(1., 1., 1., 1.)
+                self.l3.setBackgroundColor(0., 0., 0., 1.)
+                self.l3.thaw()
+            else:
+                # label provided, use it for all labels
+                self.l1 = self.l2 = self.l3 = label
+
         self.button = GuiButton.GuiButton(self.name, self.l1, self.l2,
                                           self.l3, self.l3, self.l1)
+
         self.setScale(0.1)
         self.managed = 0
 
diff --git a/direct/src/gui/Frame.py b/direct/src/gui/Frame.py
index a169abb416..22a41c6b40 100644
--- a/direct/src/gui/Frame.py
+++ b/direct/src/gui/Frame.py
@@ -111,13 +111,11 @@ class Frame(DirectObject):
     def makeWideAsWidest(self):
         # make all the buttons as wide as the widest button in
         # the frame
-        widest = 0
         widestWidth = 0.0
         # find the widest
         for item in self.items:
             thisWidth = item.getWidth()
             if (thisWidth > widestWidth):
-                widest = self.items.index(item)
                 widestWidth = thisWidth
 
         # make them all this wide
@@ -126,3 +124,5 @@ class Frame(DirectObject):
 
             
         
+
+