diff --git a/lib/phast/client/scripts/controls/AdditionalDetailWidget.js b/lib/phast/client/scripts/controls/AdditionalDetailWidget.js
index 3b94486..1a0cd8f 100644
--- a/lib/phast/client/scripts/controls/AdditionalDetailWidget.js
+++ b/lib/phast/client/scripts/controls/AdditionalDetailWidget.js
@@ -3,6 +3,7 @@ function AdditionalDetailWidget(parent)
 	this.Parent = parent;
 	this.Show = function ()
 	{
+		this.OnOpening();
 		System.ClassList.Add(this.Parent, "apb-selected");
 	};
 	this.Hide = function ()
@@ -11,9 +12,18 @@ function AdditionalDetailWidget(parent)
 	};
 	this.Toggle = function ()
 	{
+		if (!System.ClassList.Contains(this.Parent, "apb-selected"))
+		{
+			this.OnOpening();
+		}
 		System.ClassList.Toggle(this.Parent, "apb-selected");
 	};
 
+	this.OnOpening = function()
+	{
+
+	};
+
 	this.TextLink = parent.childNodes[0];
 	this.ButtonLink = parent.childNodes[1];
 
diff --git a/lib/phast/client/scripts/controls/Alert.js b/lib/phast/client/scripts/controls/Alert.js
index 8527842..bae71b7 100644
--- a/lib/phast/client/scripts/controls/Alert.js
+++ b/lib/phast/client/scripts/controls/Alert.js
@@ -1,5 +1,17 @@
 function Alert(parentElement)
 {
+	this.ParentElement = parentElement;
+	this.IconElement = this.ParentElement.children[0];
+	this.IconElement.NativeObject = this;
+	this.IconElement.addEventListener("click", function()
+	{
+		if (System.ClassList.Contains(this.NativeObject.ParentElement, "uwt-collapsible"))
+		{
+			System.ClassList.Toggle(this.NativeObject.ParentElement, "uwt-collapsed");
+		}
+	});
+
+
 	this.mvarTitle = "";
 	this.setTitle = function(value)
 	{
@@ -137,6 +149,7 @@ window.addEventListener("load", function()
 		var items = document.getElementsByClassName("uwt-alert");
 		for (var i = 0; i < items.length; i++)
 		{
+			items[i].NativeObject = new Alert(items[i]);
 			if (!System.ClassList.Contains(items[i], "uwt-alert-sticky"))
 			{
 				items[i].style.right = "-2000px";
diff --git a/lib/phast/client/scripts/controls/Disclosure.js b/lib/phast/client/scripts/controls/Disclosure.js
index f74912a..9d9ce23 100644
--- a/lib/phast/client/scripts/controls/Disclosure.js
+++ b/lib/phast/client/scripts/controls/Disclosure.js
@@ -1,48 +1,39 @@
 function Disclosure(parentElement)
 {
 	this.ParentElement = parentElement;
-	
-	parentElement.childNodes[0].childNodes[0].addEventListener("click", function(e)
+	this.TitleElement = this.ParentElement.children[0];
+	this.TitleElement.NativeObject = this;
+	this.TitleElement.addEventListener("click", function(e)
 	{
-		parentElement.NativeObject.ToggleExpanded();
+		this.NativeObject.toggleExpanded();
 		e.preventDefault();
 		e.stopPropagation();
 		return false;
 	});
 	
-	this.mvarExpanded = (parentElement.attributes["data-expanded"] != null ? parentElement.attributes["data-expanded"].value == "true" : false);
-	this.GetExpanded = function()
+	this.getExpanded = function()
 	{
-		return this.mvarExpanded;
+		return System.ClassList.Contains(this.ParentElement, "uwt-expanded");
 	};
-	this.SetExpanded = function(value)
+	this.setExpanded = function(value)
 	{
-		this.mvarExpanded = value;
-		this.Refresh();
-	};
-	this.ToggleExpanded = function()
-	{
-		this.SetExpanded(!this.GetExpanded());
-	};
-	
-	this.Refresh = function()
-	{
-		var disclosure = this.ParentElement;
-		if (this.GetExpanded())
+		if (value)
 		{
-			disclosure.className = "Disclosure Expanded";
-			disclosure.attributes["data-expanded"].value = "true";
+			System.ClassList.Add(this.ParentElement, "uwt-expanded");
 		}
 		else
 		{
-			disclosure.className = "Disclosure";
-			disclosure.attributes["data-expanded"].value = "false";
+			System.ClassList.Remove(this.ParentElement, "uwt-expanded");
 		}
 	};
+	this.toggleExpanded = function()
+	{
+		this.setExpanded(!this.getExpanded());
+	};
 }
 window.addEventListener("load", function(e)
 {
-	var items = document.getElementsByClassName("Disclosure");
+	var items = document.getElementsByClassName("uwt-disclosure");
 	for (var i = 0; i < items.length; i++)
 	{
 		items[i].NativeObject = new Disclosure(items[i]);
diff --git a/lib/phast/server/System.inc.php b/lib/phast/server/System.inc.php
index 57a698a..dfa79e1 100644
--- a/lib/phast/server/System.inc.php
+++ b/lib/phast/server/System.inc.php
@@ -1306,6 +1306,9 @@
 	}
 	
 	\date_default_timezone_set(System::GetConfigurationValue("System.DefaultTimezone", date_default_timezone_get()));
-	
-	session_start();
+
+	if (!session_start())
+	{
+		echo ("session_start didn't work!");
+	}
 ?>
diff --git a/lib/phast/server/UUID.inc.php b/lib/phast/server/UUID.inc.php
index 746b9f0..e5fd205 100644
--- a/lib/phast/server/UUID.inc.php
+++ b/lib/phast/server/UUID.inc.php
@@ -372,7 +372,7 @@
 			$guidChars .= "}";
 			return $guidChars;
 		}
-		public function __toStringFormat($includeDashes = false, $prefix = "{", $suffix = "}")
+		public function __toStringFormat($includeDashes = true, $prefix = "{", $suffix = "}")
 		{
 			$guidChars = $prefix;
 			$guidChars .= UUID::HexsToChars($this->_a >> 24, $this->_a >> 16);
diff --git a/lib/phast/server/WebControls/AdditionalDetailWidget.inc.php b/lib/phast/server/WebControls/AdditionalDetailWidget.inc.php
index 94f17b9..ddce226 100644
--- a/lib/phast/server/WebControls/AdditionalDetailWidget.inc.php
+++ b/lib/phast/server/WebControls/AdditionalDetailWidget.inc.php
@@ -128,7 +128,7 @@
 			}
 			else
 			{
-				echo ("<a class=\"apb-text apb-empty\" href=\"#\">" . $this->Text . "</span>");
+				echo ("<a class=\"apb-text apb-empty\" href=\"\">" . $this->Text . "</a>");
 			}
 		}