diff --git a/components/events.php b/components/events.php
index df920b11fe7c80ed2458c7d51b4fb02bf9dc4ee0..830581f1562928170d096ce771522c34ab7effad 100644
--- a/components/events.php
+++ b/components/events.php
@@ -68,6 +68,10 @@ if (isset($session->groups[$permission]) && isset($action)) {
 		case "edit":
 			if (isset($eventcat) && isset($eventid)) {
 				$event = $DB->GetRow("SELECT * FROM $eventtable WHERE id=?", array($eventid)); 
+
+				//make tastier breadcrumbs
+				$pathlist[$events_index + 1] = $event['name'];
+
 				$smarty->assign("event", $event);
 				$body = $smarty->fetch("event_edit.tpl");
 			}
@@ -77,6 +81,10 @@ if (isset($session->groups[$permission]) && isset($action)) {
 	// not logged in, or no special action required 
 	if (isset($eventcat) && isset($eventid)) {
 		$event = $DB->GetRow("SELECT * FROM $eventtable WHERE id=?", array($eventid));
+
+		//make tastier breadcrumbs
+		$pathlist[$events_index + 1] = $event['name'];
+
 		$smarty->assign("event", $event);
 		$body = $smarty->fetch("event.tpl");
 	} else {
diff --git a/templates/event_edit.tpl b/templates/event_edit.tpl
index 09bb8c52748cd7ff45e4649fee7477c1f1e1bb84..9417832c99ce9f2731202241be8de1a0986ab4df 100644
--- a/templates/event_edit.tpl
+++ b/templates/event_edit.tpl
@@ -17,7 +17,7 @@
 	<label for="category">Event Type</label>
 	<span class="textinput">
 		{foreach from=$event_categories item=category}
-		<input type="radio" name="category" value="{$category}" /> {$category}<br />
+		<input type="radio" name="category" value="{$category}" {if $category eq $event.category}checked="checked"{/if} /> {$category}<br />
 		{/foreach}
 	</span>
 </div>
@@ -27,7 +27,7 @@
 </div>
 <div class="row">
 	<label for="description">Description</label>
-	<span class="textinput"><textarea name="description">{if $event.description}{$event.description}{/if}</textarea></span>
+	<span class="textinput"><textarea name="description" cols="50" rows="15">{if $event.description}{$event.description}{/if}</textarea></span>
 </div>
 <div class="row">
 <input type="submit" value="Save" />
diff --git a/templates/events.tpl b/templates/events.tpl
index c42ddf403c4dbadb30556e6f0319251a1309f0bf..c325ea620c86a0c3801e778009a46e7296e45958 100644
--- a/templates/events.tpl
+++ b/templates/events.tpl
@@ -10,9 +10,10 @@
 {else}
 {foreach from=$events item=event}
 <h3>{$event.name}
-{if $editable}<a href="{$event.category}_{$event.id}?action=edit">(Edit)</a>{/if} 
+{if $editable}<a href="{$baseurl}/Community/Events/{$event.category}_{$event.id}?action=edit">(Edit)</a>{/if} 
 </h3>
-{$event.whn_timestamp|date_format:"%A, %e %B"} @ {$event.location}
+<div>{$event.whn_timestamp|date:"l, jS F"}{if $event.show_time},{$event.whn_timestamp|date_format:"%H:%M"}{/if}</div>
+<div>at {$event.location}</div>
 <p>
 {$event.description}
 </p>