diff --git a/lib/phast/server/WebControls/AdditionalDetailWidget.inc.php b/lib/phast/server/WebControls/AdditionalDetailWidget.inc.php
index 189f2f4..b67e1db 100644
--- a/lib/phast/server/WebControls/AdditionalDetailWidget.inc.php
+++ b/lib/phast/server/WebControls/AdditionalDetailWidget.inc.php
@@ -101,8 +101,8 @@
 				}
 			}
 		}
-		
-		protected function BeforeContent()
+
+		private function renderMainLink()
 		{
 			if ($this->ShowURL)
 			{
@@ -130,6 +130,11 @@
 			{
 				echo ("<span class=\"apb-text\">" . $this->Text . "</span>");
 			}
+		}
+		
+		protected function BeforeContent()
+		{
+			$this->renderMainLink();
 			
 			echo("<a class=\"apb-button\" href=\"#\"  tabindex=\"-1\">&nbsp;</a>");
 
@@ -162,20 +167,7 @@
 			echo("<h2>");
 			echo("<span class=\"apb-class-title\">" . $this->ClassTitle . "</span>");
 		
-			echo("<a href=\"");
-			if ($this->PostBackURL != "")
-			{
-				echo($this->PostBackURL);
-			}
-			else
-			{
-				echo("#");
-			}
-			echo("\"");
-
-			echo(">");
-			echo($this->Text);
-			echo("</a>");
+			$this->renderMainLink();
 			
 			echo("</h2>");
 			echo("</div>");
diff --git a/lib/phast/server/WebControls/Button.inc.php b/lib/phast/server/WebControls/Button.inc.php
index 1f5b51b..c45aad0 100644
--- a/lib/phast/server/WebControls/Button.inc.php
+++ b/lib/phast/server/WebControls/Button.inc.php
@@ -36,7 +36,7 @@
 			parent::__construct();
 			
 			$this->TagName = "div";
-			$this->ClassList[] = "pwt-Button";
+			$this->ClassList[] = "uwt-button";
 			
 			$this->DropDownControls = array();
 			$this->DropDownRequired = false;
@@ -54,7 +54,7 @@
 				
 				foreach ($this->ClassList as $className)
 				{
-					if ($className == "pwt-Button") continue;
+					if ($className == "uwt-button") continue;
 					$tag->ClassList[] = $className;
 				}
 				
@@ -116,7 +116,7 @@
 			}
 			
 			$aDropDown = new Anchor();
-			$aDropDown->ClassList[] = "pwt-Button pwt-DropDownButton";
+			$aDropDown->ClassList[] = "uwt-button pwt-DropDownButton";
 			$aDropDown->InnerHTML = "&nbsp;";
 			$this->Controls[] = $aDropDown;