diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index 9db5b60e9..9d22ca175 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -154,7 +154,7 @@ sub getAdminFunction {
 		},
 		"versions"=>{
 			title=>{
-				id=>"content versioning",
+				id=>"version tags",
 				namespace=>"VersionTag"
 			},
 			icon=>"versionTags.gif",
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index 23d72393c..380717784 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -116,7 +116,7 @@ sub process {
 	}
 	if (scalar(@tags)) {
 		push(@adminbar, {
-			label => $i18n->get("version tags"),
+			label => $i18n->get("version tags","VersionTag"),
 			name => "versions",
 			items => \@tags
 			});
diff --git a/lib/WebGUI/Operation/VersionTag.pm b/lib/WebGUI/Operation/VersionTag.pm
index 4cac0017c..c1fa9eca2 100644
--- a/lib/WebGUI/Operation/VersionTag.pm
+++ b/lib/WebGUI/Operation/VersionTag.pm
@@ -280,7 +280,7 @@ sub www_manageVersions {
 	$ac->setHelp("versions manage");
 	$ac->addSubmenuItem($session->url->page('op=editVersionTag'), $i18n->get("add a version tag"));
 	$ac->addSubmenuItem($session->url->page('op=manageCommittedVersions'), $i18n->get("manage committed versions")) if ($session->user->isInGroup(3));
-	my ($tag) = $session->db->quickArray("select name from assetVersionTag where tagId=?",[$session->scratch->get("versionTag")]);
+	my ($tag,$workingTagId) = $session->db->quickArray("select name,tagId from assetVersionTag where tagId=?",[$session->scratch->get("versionTag")]);
 	$tag ||= "None";
 	my $rollback = $i18n->get("rollback");
 	my $commit = $i18n->get("commit");
@@ -301,8 +301,11 @@ sub www_manageVersions {
 			<td><a href="'.$session->url->page("op=manageRevisionsInTag;tagId=".$id).'">'.$name.'</a></td>
 			<td>'.$session->datetime->epochToHuman($date).'</td>
 			<td>'.$u->username.'</td>
-			<td>
-			<a href="'.$session->url->page("op=setWorkingVersionTag;tagId=".$id).'">'.$setTag.'</a> |
+			<td>';
+		unless ($workingTagId eq $id) {
+			$output .= '<a href="'.$session->url->page("op=setWorkingVersionTag;tagId=".$id).'">'.$setTag.'</a> | ';
+		}
+		$output .='
 			<a href="'.$session->url->page("op=commitVersionTag;tagId=".$id).'" onclick="return confirm(\''.$commitPrompt.'\');">'.$commit.'</a></td></tr>';
 	}
 	$sth->finish;	
@@ -381,7 +384,7 @@ sub www_manageRevisionsInTag {
 		my $asset = WebGUI::Asset->new($session,$id,$class,$date);
                 $output .= '<tr><td>'
 			.$session->icon->delete("func=purgeRevision;proceed=manageRevisionsInTag;tagId=".$tag->getId.";revisionDate=".$date,$asset->get("url"),$i18n->get("purge revision prompt"))
-			.$session->icon->view("func=viewRevision;revisionDate=".$date)
+			.$session->icon->view("func=viewRevision;revisionDate=".$date, $asset->get("url"))
 			.'</td>
 			<td>'.$asset->getTitle.'</td>
 			<td><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" />'.$asset->getName.'</td>
diff --git a/lib/WebGUI/Operation/Workflow.pm b/lib/WebGUI/Operation/Workflow.pm
index a2709fe8c..ec190c5f6 100644
--- a/lib/WebGUI/Operation/Workflow.pm
+++ b/lib/WebGUI/Operation/Workflow.pm
@@ -158,7 +158,7 @@ sub www_editWorkflow {
 		label=>$i18n->get("title"),
 		hoverHelp=>$i18n->get("title help")
 		);
-	$f->text(
+	$f->textarea(
 		name=>"description",
 		value=>$workflow->get("description"),
 		label=>$i18n->get("description"),
diff --git a/lib/WebGUI/Workflow/Activity.pm b/lib/WebGUI/Workflow/Activity.pm
index 35ff6910d..44b9e236b 100644
--- a/lib/WebGUI/Workflow/Activity.pm
+++ b/lib/WebGUI/Workflow/Activity.pm
@@ -361,7 +361,9 @@ sub processPropertiesFromFormPost {
 		}
 	}
 	$data{title} = $fullDefinition->[0]{name} if ($data{title} eq "" || lc($data{title}) eq "untitled");
-	$self->set(\%data);
+	foreach my $key (keys %data) {
+		$self->set($key, $data{$key});
+	}
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/i18n/English/Macro_AdminBar.pm b/lib/WebGUI/i18n/English/Macro_AdminBar.pm
index fe069bb39..b4399ecd2 100644
--- a/lib/WebGUI/i18n/English/Macro_AdminBar.pm
+++ b/lib/WebGUI/i18n/English/Macro_AdminBar.pm
@@ -73,11 +73,6 @@ The URL of an icon to associate with this item.
 		lastUpdated => 1031514049
 	},
 
-	'version tags' => {
-		message => q|Version Tags|,
-		lastUpdated => 0 
-	},
-
 	'12' => {
 		message => q|Turn admin off.|,
 		lastUpdated => 1031514049
diff --git a/lib/WebGUI/i18n/English/VersionTag.pm b/lib/WebGUI/i18n/English/VersionTag.pm
index 53bb27123..dad1490bb 100644
--- a/lib/WebGUI/i18n/English/VersionTag.pm
+++ b/lib/WebGUI/i18n/English/VersionTag.pm
@@ -1,6 +1,11 @@
 package WebGUI::i18n::English::VersionTag;
 
 our $I18N = {
+	'version tags' => {
+		message => q|Version Tags|,
+		lastUpdated => 0 
+	},
+
 	'commit accepted' => {
 		message => q|Your tag has been submitted for approval and commit. It may take some time before it appears live on the site. Where would you like to go next?|,
 		lastUpdated => 0,
diff --git a/lib/WebGUI/i18n/English/Workflow.pm b/lib/WebGUI/i18n/English/Workflow.pm
index 734944a5e..875325660 100644
--- a/lib/WebGUI/i18n/English/Workflow.pm
+++ b/lib/WebGUI/i18n/English/Workflow.pm
@@ -26,7 +26,7 @@ our $I18N = {
 	},
 
 	'is serial help' => {
-		message => q|If yes is selected then only one instance of this workflow will be allowed to be created at one time. Generally speaking this would be a bad idea for approval workflows, but is probably a good idea for workflows the download emails from a remote server, to avoid getting duplicates.|,
+		message => q|If yes is selected then only one instance of this workflow will be allowed to be created at one time. Generally speaking this would be a bad idea for approval workflows, but is probably a good idea for workflows that download emails from a remote server, to avoid getting duplicates.|,
 		context => q|the hover help for the is serial field|,
 		lastUpdated => 0,
 	},