diff --git a/Web/Controllers/CreateLogController.cs b/Web/Controllers/CreateLogController.cs
index 01191a5..49791fc 100644
--- a/Web/Controllers/CreateLogController.cs
+++ b/Web/Controllers/CreateLogController.cs
@@ -109,6 +109,8 @@ namespace MileageTraker.Web.Controllers
 					.First(pt => pt.PurposeTypeId == model.Purpose.Selected);
 
 				DataService.AddLog(log);
+				var editLink = Url.Action("EditPast", "CreateLog", new {id = log.LogId});
+				
 				TempData["StatusMessage-Type"] = "alert-success";
 				TempData["StatusMessage"] =
 					@"You've successfully created an entry
@@ -117,7 +119,8 @@ namespace MileageTraker.Web.Controllers
 					on <strong>" + model.Date.ToShortDateString() + @"</strong>
 					in Vehicle Id <strong>" + model.VehicleId + @"</strong>
 					ending in <strong>" + model.EndOdometer + @"</strong>
-					miles on the odometer.";
+					miles on the odometer. " +
+					@"<a href='" + editLink + @"' class='btn btn-mini btn-success'>Edit</a>";
 				return RedirectToAction("Index");
 			}
 
diff --git a/Web/Scripts/Shared/Site.js b/Web/Scripts/Shared/Site.js
index ebcc5d2..bfb5632 100644
--- a/Web/Scripts/Shared/Site.js
+++ b/Web/Scripts/Shared/Site.js
@@ -103,24 +103,28 @@ $(function() {
     });
 });
 
-$(function () {
-    var textToIcon = {
-        'Edit': 'edit', 
-        'Filter': 'filter',
-        'Details' : 'zoom-in',
-        'Delete': 'trash',
-        'Add': 'plus',
-        'Export': 'download',
-        'Driver Mileage': 'user',
-        'Vehicle Mileage': 'car'
-    };
-    $.each(textToIcon, function(text, icon) {
-        $("a:contains('" + text + "')")
+function addButtonIcons () {
+	var textToIcon = {
+		'Edit': 'edit', 
+		'Filter': 'filter',
+		'Details' : 'zoom-in',
+		'Delete': 'trash',
+		'Add': 'plus',
+		'Export': 'download',
+		'Driver Mileage': 'user',
+		'Vehicle Mileage': 'car'
+	};
+	$.each(textToIcon, function(text, icon) {
+		$("a:contains('" + text + "'):not(:has(i))")
             .prepend('<i class="icon-' + icon + '" /> ');
-    });
+	});
 
-    $(".navbar-inverse a[title='Manage']")
+	$(".navbar-inverse a[title='Manage']:not(:has(i))")
         .prepend('<i class="icon-user icon-white" /> ');
+}
+
+$(function () {
+	addButtonIcons();
 });
 
 // Convert MVC3 WebGrid paging to Bootstrap
diff --git a/Web/Views/CreateLog/EditPast.cshtml b/Web/Views/CreateLog/EditPast.cshtml
index fc09bbc..ec5a6be 100644
--- a/Web/Views/CreateLog/EditPast.cshtml
+++ b/Web/Views/CreateLog/EditPast.cshtml
@@ -15,8 +15,8 @@
         @Html.Partial("_ValidationSummary")
         @Html.EditorForModel()
         <div class="form-actions">
-	        <input type="submit" value="Submit" class="btn btn-primary" />
-			@Html.ActionLink("Cancel", "Index", new {}, new { @class = "btn" })
+	        <input type="submit" value="Update" class="btn btn-primary" />
+			@Html.ActionLink("Cancel", "Index", new {}, new { @class = "btn btn-mini" })
         </div>
     </fieldset>
 }
diff --git a/Web/Views/CreateLog/RecentLogs.cshtml b/Web/Views/CreateLog/RecentLogs.cshtml
index cf98c2e..adb544c 100644
--- a/Web/Views/CreateLog/RecentLogs.cshtml
+++ b/Web/Views/CreateLog/RecentLogs.cshtml
@@ -39,6 +39,7 @@
 					@Html.Encode(log.LogType.Enum.GetDisplayShortName())
 				</td>
 				<td>
+					<div class='btn-group'>
 					@if (log.Date >= DomainRules.GetLogEntryCutoff())
 					{
 						@Html.ActionLink("Edit", "EditPast", new {id = log.LogId}, new {@class = "btn btn-mini"})
@@ -47,6 +48,7 @@
 					{
 						@Html.ActionLink("Edit", "EditPast", new {id = log.LogId}, new {@class = "btn btn-mini disabled", title="Previous Month" })
 					}
+					</div>
 				</td>
 			</tr>
 		}
@@ -57,5 +59,8 @@ else
     <p>Mileage history not found for <strong>@ViewData["name"]</strong></p>
 }
 <script type="text/javascript">
-	$('a.btn.disabled').prop('disabled', true).removeAttr('href');
+	$(function () {
+		$('a.btn.disabled').prop('disabled', true).removeAttr('href');
+		addButtonIcons();
+	});
 </script>
\ No newline at end of file