diff --git a/Src/VideoGameQuotes.Web/Configuration/EnableSearchWithLucene.cs b/Src/VideoGameQuotes.Web/Configuration/EnableSearchWithLucene.cs
index 7f8ac58..158d6c4 100644
--- a/Src/VideoGameQuotes.Web/Configuration/EnableSearchWithLucene.cs
+++ b/Src/VideoGameQuotes.Web/Configuration/EnableSearchWithLucene.cs
@@ -33,10 +33,10 @@ namespace VideoGameQuotes.Web.Configuration {
 				.RegisterInstance(Version.LUCENE_29)
 				.RegisterType<Analyzer, StandardAnalyzer>(new InjectionConstructor(typeof(Version)))
 				.RegisterType<QueryParser>(new InjectionFactory(CreateQueryParser))
-				.RegisterAndIntercept(typeof(ISearcher<>), typeof(LuceneEntitySearcher<>))
-				.RegisterAndIntercept(typeof(ISearchService<>), typeof(SearchService<>))
+				.RegisterAndIntercept(typeof(ISearcher<,>), typeof(LuceneEntitySearcher<,>))
+				.RegisterAndIntercept(typeof(ISearchService<,>), typeof(SearchService<,>))
 				.RegisterAndIntercept<ILuceneDocumentHandler<Quote>, QuoteDocumentHandler>()
-				.RegisterAndIntercept(typeof(ISearchIndexBuilder<>), typeof(LuceneEntityIndexBuilder<>));
+				.RegisterAndIntercept(typeof(ISearchIndexBuilder<,>), typeof(LuceneEntityIndexBuilder<,>));
 
 			Container
 				.Configure<Interception>()
diff --git a/Src/VideoGameQuotes.Web/Configuration/UpdateSearchIndexCallHandler.cs b/Src/VideoGameQuotes.Web/Configuration/UpdateSearchIndexCallHandler.cs
index af43d4b..0961b77 100644
--- a/Src/VideoGameQuotes.Web/Configuration/UpdateSearchIndexCallHandler.cs
+++ b/Src/VideoGameQuotes.Web/Configuration/UpdateSearchIndexCallHandler.cs
@@ -31,7 +31,7 @@ namespace VideoGameQuotes.Web.Configuration {
 				return returnValue;
 			}
 
-			container.Resolve<ISearchIndexBuilder<Quote>>().UpdateIndex(quote);
+			container.Resolve<ISearchIndexBuilder<Quote, int>>().UpdateIndex(quote);
 
 			return returnValue;
 		}
diff --git a/Src/VideoGameQuotes.Web/Controllers/ApiController.cs b/Src/VideoGameQuotes.Web/Controllers/ApiController.cs
index 48b9843..0eff449 100644
--- a/Src/VideoGameQuotes.Web/Controllers/ApiController.cs
+++ b/Src/VideoGameQuotes.Web/Controllers/ApiController.cs
@@ -91,7 +91,7 @@ namespace VideoGameQuotes.Web.Controllers {
 				records = new[] { repository.FindById(model.Id) };
 			}
 
-			return records.ToArray().Select(entity => entity.ToDto<T, int, TDto>());
+			return records.ToArray().Select(entity => entity.ToDto<TDto>());
 		}
 
 		[UnitOfWork]
diff --git a/Src/VideoGameQuotes.Web/Controllers/QuoteController.cs b/Src/VideoGameQuotes.Web/Controllers/QuoteController.cs
index cc10a1a..1516c69 100644
--- a/Src/VideoGameQuotes.Web/Controllers/QuoteController.cs
+++ b/Src/VideoGameQuotes.Web/Controllers/QuoteController.cs
@@ -21,9 +21,9 @@ namespace VideoGameQuotes.Web.Controllers {
 	public class QuoteController : Controller {
 		private readonly IQuoteService quoteService;
 		private readonly ICurrentUserProvider<User> currentUserProvider;
-		private readonly ISearcher<Quote> quoteSearcher;
+		private readonly ISearcher<Quote, int> quoteSearcher;
 
-		public QuoteController(IQuoteService quoteService, ICurrentUserProvider<User> currentUserProvider, ISearcher<Quote> quoteSearcher) {
+		public QuoteController(IQuoteService quoteService, ICurrentUserProvider<User> currentUserProvider, ISearcher<Quote, int> quoteSearcher) {
 			this.quoteService = quoteService;
 			this.currentUserProvider = currentUserProvider;
 			this.quoteSearcher = quoteSearcher;
diff --git a/Src/VideoGameQuotes.Web/Global.asax.cs b/Src/VideoGameQuotes.Web/Global.asax.cs
index 1a570e0..60dc2d5 100644
--- a/Src/VideoGameQuotes.Web/Global.asax.cs
+++ b/Src/VideoGameQuotes.Web/Global.asax.cs
@@ -5,6 +5,7 @@ using Microsoft.Practices.Unity;
 using Portoa.Search;
 using Portoa.Web;
 using Portoa.Web.Models;
+using Portoa.Web.Routing;
 using Portoa.Web.Security;
 using Portoa.Web.Unity;
 using UnityGenerics;
@@ -41,7 +42,7 @@ namespace VideoGameQuotes.Web {
 		}
 
 		protected override void AfterStartUp() {
-			Container.Resolve<ISearchIndexBuilder<Quote>>().BuildIndex();
+			Container.Resolve<ISearchIndexBuilder<Quote, int>>().BuildIndex();
 		}
 
 		protected override void OnApplicationEnd() {
@@ -55,24 +56,24 @@ namespace VideoGameQuotes.Web {
 			routes.MapRoute("favicon", "favicon.ico", new { controller = "Home", action = "Favicon" });
 
 			//bullshit route so that RenderAction works
-			routes.MapRoute("mainmenu", "home/mainmenu", new { controller = "Home", action = "MainMenu" });
-			routes.MapRoute("quote-of-the-day", "quote/quoteoftheday", new { controller = "Quote", action = "QuoteOfTheDay" });
+			routes.MapSmartRoute("mainmenu", "home/mainmenu", new { controller = "Home", action = "MainMenu" });
+			routes.MapSmartRoute("quote-of-the-day", "quote/quoteoftheday", new { controller = "Quote", action = "QuoteOfTheDay" });
 
-			routes.MapRoute("crud-default", "{controller}/{action}", null, new { controller = "system|publisher|game|category", action = "create|edit|delete" });
-			routes.MapRoute("users-paged", "admin/users/{start}-{end}", new { controller = "Admin", action = "Users" }, new { start = @"\d+", end = @"\d+" });
-			routes.MapRoute("admin", "admin/{action}", new { controller = "Admin", action = "Index" }, new { action = "users|create|flags|password" });
-			routes.MapRoute("user-edit", "user/edit/{usernameOrIp}", new { controller = "User", action = "Edit",  usernameOrIp = @"\w+" });
-			routes.MapRoute("user-default", "user/{action}/{id}", new { controller = "User", action = "delete|ban", id = UrlParameter.Optional });
-			routes.MapRoute("api", "api/{action}/{id}/{*criteria}", new { controller = "Api" }, new { action = "game|system|category|publisher|quote", id = @"\d+|all" });
-			routes.MapRoute("home", "{action}", new { controller = "Home", action = "Index" }, new { action = "about|contact|login|logout" });
-			routes.MapRoute("paged", "{action}/{page}", new { controller = "Quote", page = 1 }, new { action = "best|recent", page = @"\d+" });
-			routes.MapRoute("browse", "browse/{*qualifiers}", new { controller = "Quote", action = "Browse" });
-			routes.MapRoute("search", "search/{*searchQuery}", new { controller = "Quote", action = "Search" });
-			routes.MapRoute("quote-task", "quote/{action}/{id}", new { controller = "Quote" }, new { action = "edit", id = @"\d+" });
-			routes.MapRoute("quote", "{action}", new { controller = "Quote" }, new { action = "submit|recent|random|vote|flag" });
-			routes.MapRoute("dismiss-flag", "dismiss-flag", new { controller = "Quote", action = "DismissFlag" });
-			routes.MapRoute("individual-quote", "quote/{id}/{*text}", new { controller = "Quote", action = "Quote" }, new { id = @"\d+" });
-			routes.MapRoute("default", "{controller}", new { controller = "home", action = "index" });
+			routes.MapSmartRoute("crud-default", "{controller}/{action}", null, new { controller = "system|publisher|game|category", action = "create|edit|delete" });
+			routes.MapSmartRoute("users-paged", "admin/users/{start}-{end}", new { controller = "Admin", action = "Users" }, new { start = @"\d+", end = @"\d+" });
+			routes.MapSmartRoute("admin", "admin/{action}", new { controller = "Admin", action = "Index" }, new { action = "users|create|flags|password" });
+			routes.MapSmartRoute("user-edit", "user/edit/{usernameOrIp}", new { controller = "User", action = "Edit", usernameOrIp = @"\w+" });
+			routes.MapSmartRoute("user-default", "user/{action}/{id}", new { controller = "User", action = "delete|ban", id = UrlParameter.Optional });
+			routes.MapSmartRoute("api", "api/{action}/{id}/{*criteria}", new { controller = "Api" }, new { action = "game|system|category|publisher|quote", id = @"\d+|all" });
+			routes.MapSmartRoute("home", "{action}", new { controller = "Home", action = "Index" }, new { action = "about|contact|login|logout" });
+			routes.MapSmartRoute("paged", "{action}/{page}", new { controller = "Quote", page = 1 }, new { action = "best|recent", page = @"\d+" });
+			routes.MapSmartRoute("browse", "browse/{*qualifiers}", new { controller = "Quote", action = "Browse" });
+			routes.MapSmartRoute("search", "search/{*searchQuery}", new { controller = "Quote", action = "Search" });
+			routes.MapSmartRoute("quote-task", "quote/{action}/{id}", new { controller = "Quote" }, new { action = "edit", id = @"\d+" });
+			routes.MapSmartRoute("quote", "{action}", new { controller = "Quote" }, new { action = "submit|recent|random|vote|flag" });
+			routes.MapSmartRoute("dismiss-flag", "dismiss-flag", new { controller = "Quote", action = "DismissFlag" });
+			routes.MapSmartRoute("individual-quote", "quote/{id}/{*text}", new { controller = "Quote", action = "Quote" }, new { id = @"\d+" });
+			routes.MapSmartRoute("default", "{controller}", new { controller = "home", action = "index" });
 		}
 	}
 }
\ No newline at end of file
diff --git a/Src/VideoGameQuotes.Web/Search/SearchService.cs b/Src/VideoGameQuotes.Web/Search/SearchService.cs
index 9f90402..6841fa4 100644
--- a/Src/VideoGameQuotes.Web/Search/SearchService.cs
+++ b/Src/VideoGameQuotes.Web/Search/SearchService.cs
@@ -1,18 +1,19 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Portoa.Persistence;
 using Portoa.Search;
 
 namespace VideoGameQuotes.Web.Search {
-	public class SearchService<T> : ISearchService<T> where T : Entity<T, int> {
-		private readonly IRepository<T> repository;
+	public class SearchService<T, TId> : ISearchService<T, TId> where T : IIdentifiable<TId> {
+		private readonly IRepository<T, TId> repository;
 
-		public SearchService(IRepository<T> repository) {
+		public SearchService(IRepository<T, TId> repository) {
 			this.repository = repository;
 		}
 
 		[UnitOfWork]
-		public IEnumerable<T> FindByIds(IEnumerable<int> ids) {
+		public IEnumerable<T> FindByIds(IEnumerable<TId> ids) {
 			return repository
 				.Records
 				.Where(entity => ids.ToArray().Contains(entity.Id));
@@ -22,5 +23,9 @@ namespace VideoGameQuotes.Web.Search {
 		public IEnumerable<T> GetAllIndexableRecords() {
 			return repository.Records;
 		}
+
+		public TId ConvertIdFromStringValue(string idValue) {
+			return (TId)Convert.ChangeType(idValue, typeof(TId));
+		}
 	}
 }
\ No newline at end of file
diff --git a/Src/VideoGameQuotes.Web/VideoGameQuotes.Web.csproj b/Src/VideoGameQuotes.Web/VideoGameQuotes.Web.csproj
index 91e1bb2..17e6b51 100644
--- a/Src/VideoGameQuotes.Web/VideoGameQuotes.Web.csproj
+++ b/Src/VideoGameQuotes.Web/VideoGameQuotes.Web.csproj
@@ -53,6 +53,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Lib\Microsoft.Practices.Unity.Interception.dll</HintPath>
     </Reference>
+    <Reference Include="MySql.Data, Version=6.3.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Lib\MySql.Data.dll</HintPath>
+    </Reference>
     <Reference Include="NHibernate.ByteCode.LinFu, Version=3.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Lib\NHibernate.ByteCode.LinFu.dll</HintPath>
@@ -204,7 +208,7 @@
     <Content Include="Views\Home\Contact.aspx" />
     <Content Include="Views\Home\ContactSuccess.aspx" />
     <Content Include="Views\Shared\CaptchaJavaScript.ascx" />
-    <Content Include="Views\Quote\PagingMenu.ascx" />
+    <Content Include="Views\Shared\PagingMenu.ascx" />
     <Content Include="Views\Quote\QuoteFormJavaScript.ascx" />
     <Content Include="Views\Quote\QuoteOfTheDay.ascx" />
     <Content Include="Views\Shared\BadPaging.aspx" />
diff --git a/Src/VideoGameQuotes.Web/Views/Admin/CreateAdminSuccess.aspx b/Src/VideoGameQuotes.Web/Views/Admin/CreateAdminSuccess.aspx
index 26af07c..beae2fc 100644
--- a/Src/VideoGameQuotes.Web/Views/Admin/CreateAdminSuccess.aspx
+++ b/Src/VideoGameQuotes.Web/Views/Admin/CreateAdminSuccess.aspx
@@ -3,7 +3,7 @@
 <asp:Content runat="server" ID="Main" ContentPlaceHolderID="MainContent">
 	<h2>Success</h2>
 	<p>
-		The user <%= Html.ActionLink(Model.Username, "user", "admin", new { id = Model.UserId }, null) %> is now
+		The user <%= Html.ActionLink(Model.Username, "User", "Admin", new { id = Model.UserId }, null) %> is now
 		an admin.
 	</p>
 </asp:Content>
diff --git a/Src/VideoGameQuotes.Web/Views/Admin/FlaggedQuote.ascx b/Src/VideoGameQuotes.Web/Views/Admin/FlaggedQuote.ascx
index 74304fc..91c34c4 100644
--- a/Src/VideoGameQuotes.Web/Views/Admin/FlaggedQuote.ascx
+++ b/Src/VideoGameQuotes.Web/Views/Admin/FlaggedQuote.ascx
@@ -5,6 +5,6 @@
 	<span class="flag-count"><%: Model.Flags.Count() %></span>
 
 	<p>
-		<%= Html.ActionLink(Model.GetAbbreviatedText(), "quote", "quote", new { id = Model.Id, text = Model.GetUrlFriendlyText() }, null) %>
+		<%= Html.ActionLink(Model.GetAbbreviatedText(), "Quote", "Quote", new { id = Model.Id, text = Model.GetUrlFriendlyText() }, null) %>
 	</p>
 </div>
diff --git a/Src/VideoGameQuotes.Web/Views/Admin/Index.aspx b/Src/VideoGameQuotes.Web/Views/Admin/Index.aspx
index f3e32b5..9f17afc 100644
--- a/Src/VideoGameQuotes.Web/Views/Admin/Index.aspx
+++ b/Src/VideoGameQuotes.Web/Views/Admin/Index.aspx
@@ -4,9 +4,9 @@
 	<h2>Site Administration</h2>
 
 	<ul>
-		<li><%= Html.ActionLink("Create admin", "create", "admin") %></li>
-		<li><%= Html.ActionLink("Change password", "password", "admin") %></li>
-		<li><%= Html.ActionLink("View quote flags", "flags", "admin") %></li>
-		<li><%= Html.ActionLink("Manage users", "users", "admin") %></li>
+		<li><%= Html.ActionLink("Create admin", "Create", "Admin") %></li>
+		<li><%= Html.ActionLink("Change password", "Password", "Admin") %></li>
+		<li><%= Html.ActionLink("View quote flags", "Flags", "Admin") %></li>
+		<li><%= Html.ActionLink("Manage users", "Users", "Admin") %></li>
 	</ul>
 </asp:Content>
\ No newline at end of file
diff --git a/Src/VideoGameQuotes.Web/Views/Admin/PasswordSuccessfullyChanged.aspx b/Src/VideoGameQuotes.Web/Views/Admin/PasswordSuccessfullyChanged.aspx
index a6663b2..ae3e009 100644
--- a/Src/VideoGameQuotes.Web/Views/Admin/PasswordSuccessfullyChanged.aspx
+++ b/Src/VideoGameQuotes.Web/Views/Admin/PasswordSuccessfullyChanged.aspx
@@ -6,6 +6,6 @@
 	</p>
 
 	<p>
-		<%= Html.ActionLink("Administer more stuff", "index", "admin") %>
+		<%= Html.ActionLink("Administer more stuff", "Index", "Admin") %>
 	</p>
 </asp:Content>
diff --git a/Src/VideoGameQuotes.Web/Views/Admin/SingleUser.ascx b/Src/VideoGameQuotes.Web/Views/Admin/SingleUser.ascx
index 736de40..0166d13 100644
--- a/Src/VideoGameQuotes.Web/Views/Admin/SingleUser.ascx
+++ b/Src/VideoGameQuotes.Web/Views/Admin/SingleUser.ascx
@@ -16,9 +16,9 @@
 	
 	<% if (Model.CurrentUser.Group == UserGroup.Admin) { %>
 	<div class="user-admin">
-		<%= Html.ActionLink("edit", "edit", "User", new { usernameOrIp = Model.User.Username ?? Model.User.IpAddress }, null) %> |
-		<%= Html.ActionLink("delete", "delete", "User", new { id = Model.User.Id }, null)%> |
-		<%= Html.ActionLink("ban", "ban", "User", new { id = Model.User.Id }, null)%>
+		<%= Html.ActionLink("edit", "Edit", "User", new { usernameOrIp = Model.User.Username ?? Model.User.IpAddress }, null) %> |
+		<%= Html.ActionLink("delete", "Delete", "User", new { id = Model.User.Id }, null)%> |
+		<%= Html.ActionLink("ban", "Ban", "User", new { id = Model.User.Id }, null)%>
 	</div>
 	<% } %>
 
diff --git a/Src/VideoGameQuotes.Web/Views/Admin/Users.aspx b/Src/VideoGameQuotes.Web/Views/Admin/Users.aspx
index 4f6351d..f59a167 100644
--- a/Src/VideoGameQuotes.Web/Views/Admin/Users.aspx
+++ b/Src/VideoGameQuotes.Web/Views/Admin/Users.aspx
@@ -1,15 +1,11 @@
 <%@ Page Title="" Language="C#" Inherits="System.Web.Mvc.ViewPage<VideoGameQuotes.Web.Models.PagedModelWithUser<VideoGameQuotes.Api.User>>" MasterPageFile="~/Views/Shared/Site.Master" %>
+<%@ Import Namespace="Portoa.Web.Models" %>
 <%@ Import Namespace="VideoGameQuotes.Web.Models" %>
 <asp:Content runat="server" ID="Title" ContentPlaceHolderID="TitleContent">Manage Users</asp:Content>
 <asp:Content runat="server" ID="Main" ContentPlaceHolderID="MainContent">
 	<h2>Users</h2>
 
-	<p>
-	<% if (Model.HasPrevious) { %>
-		<%= Html.ActionLink("previous", "users", new { start = Model.PreviousStart, end = Model.PreviousEnd }) %>
-	<% } %>
-		<%= Html.ActionLink("next", "users", new { start = Model.NextStart, end = Model.NextEnd }) %>
-	</p>
+	<% Html.RenderPartial("PagingMenu", new PagingMenuModel(Model) { Action = "Users", Controller = "Admin" }); %>
 
 	<%
 		foreach (var user in Model.Records) {
diff --git a/Src/VideoGameQuotes.Web/Views/Home/Index.aspx b/Src/VideoGameQuotes.Web/Views/Home/Index.aspx
index ad7ea2e..11df3c7 100644
--- a/Src/VideoGameQuotes.Web/Views/Home/Index.aspx
+++ b/Src/VideoGameQuotes.Web/Views/Home/Index.aspx
@@ -5,8 +5,8 @@
 	<h2>Welcome</h2>
 
 	<p>
-		Welcome to <strong>Video Game Quotes</strong>. You can <%= Html.ActionLink("browse", "browse", "quote") %>, 
-		<%= Html.ActionLink("rate", "best", "quote") %> and <%= Html.ActionLink("submit", "submit", "quote") %> 
+		Welcome to <strong>Video Game Quotes</strong>. You can <%= Html.ActionLink("browse", "Browse", "Quote") %>, 
+		<%= Html.ActionLink("rate", "Best", "Quote") %> and <%= Html.ActionLink("submit", "Submit", "Quote") %> 
 		quotes from video games. You do not need to register or login to perform any of these tasks.
 		 Participation is encouraged.
 	</p>
@@ -21,7 +21,7 @@
 	<p>
 		If you have ideas to make this place suck less, or if you just want to express your admiration
 		for its creator (i.e. me), don&rsquo;t hesitate to contact him (i.e. me) using the
-		<%= Html.ActionLink("contact", "contact", "home") %> form.
+		<%= Html.ActionLink("contact", "Contact", "Home") %> form.
 	</p>
 
 	<p>
diff --git a/Src/VideoGameQuotes.Web/Views/Quote/Best.aspx b/Src/VideoGameQuotes.Web/Views/Quote/Best.aspx
index 4ced243..01cfd4f 100644
--- a/Src/VideoGameQuotes.Web/Views/Quote/Best.aspx
+++ b/Src/VideoGameQuotes.Web/Views/Quote/Best.aspx
@@ -4,7 +4,7 @@
 <asp:Content runat="server" ID="Title" ContentPlaceHolderID="TitleContent">Best</asp:Content>
 <asp:Content runat="server" ID="Main" ContentPlaceHolderID="MainContent">
 
-	<% Html.RenderPartial("PagingMenu", new PagingMenuModel(Model) { Action = "best", Controller = "quote" }); %>
+	<% Html.RenderPartial("PagingMenu", new PagingMenuModel(Model) { Action = "Best", Controller = "Quote" }); %>
 		
 	<%
 		foreach (var quote in Model.Records) {
diff --git a/Src/VideoGameQuotes.Web/Views/Quote/QuoteOfTheDay.ascx b/Src/VideoGameQuotes.Web/Views/Quote/QuoteOfTheDay.ascx
index fe8d24d..e97f54b 100644
--- a/Src/VideoGameQuotes.Web/Views/Quote/QuoteOfTheDay.ascx
+++ b/Src/VideoGameQuotes.Web/Views/Quote/QuoteOfTheDay.ascx
@@ -12,7 +12,7 @@
 		</div>
 
 		<div class="quote-text">
-			<a href="<%= Url.Action("quote", "quote", new { id = Model.Id, text = Model.GetUrlFriendlyText() }) %>">
+			<a href="<%= Url.Action("Quote", "Quote", new { id = Model.Id, text = Model.GetUrlFriendlyText() }) %>">
 				<%= Model.FormatTextForHtml() %>
 			</a>
 		</div>
diff --git a/Src/VideoGameQuotes.Web/Views/Quote/Recent.aspx b/Src/VideoGameQuotes.Web/Views/Quote/Recent.aspx
index 36782be..7f3214d 100644
--- a/Src/VideoGameQuotes.Web/Views/Quote/Recent.aspx
+++ b/Src/VideoGameQuotes.Web/Views/Quote/Recent.aspx
@@ -3,7 +3,7 @@
 <%@ Import Namespace="VideoGameQuotes.Web.Models" %>
 <asp:Content runat="server" ID="Title" ContentPlaceHolderID="TitleContent">Recent: <%= Model.Start %>&ndash;<%= Model.End %></asp:Content>
 <asp:Content runat="server" ID="Main" ContentPlaceHolderID="MainContent">
-	<% Html.RenderPartial("PagingMenu", new PagingMenuModel(Model) { Action = "recent", Controller = "quote" }); %>
+	<% Html.RenderPartial("PagingMenu", new PagingMenuModel(Model) { Action = "Recent", Controller = "Quote" }); %>
 		
 	<%
 		foreach (var quote in Model.Records) {
diff --git a/Src/VideoGameQuotes.Web/Views/Shared/MainMenu.ascx b/Src/VideoGameQuotes.Web/Views/Shared/MainMenu.ascx
index 3f643bd..fb770c2 100644
--- a/Src/VideoGameQuotes.Web/Views/Shared/MainMenu.ascx
+++ b/Src/VideoGameQuotes.Web/Views/Shared/MainMenu.ascx
@@ -1,13 +1,13 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<VideoGameQuotes.Web.Models.MainMenuModel>" %>
 <%@ Import Namespace="VideoGameQuotes.Api" %>
 
-							<li><%= Html.ActionLink("Recent", "recent", "Quote", null, new { title = "View most recently submitted quotes" })%></li>
-							<li><%= Html.ActionLink("Best", "best", "quote", null, new { title = "View the top rated quotes" })%></li>
-							<li><%= Html.ActionLink("Browse", "browse", "Quote", new { qualifiers = "" }, new { title = "Browse the quote database" })%></li>
-							<li><%= Html.ActionLink("Random", "random", "Quote", null, new { title = "View a random quote" })%></li>
-							<li><%= Html.ActionLink("Submit", "submit", "Quote", null, new { title = "Submit a new quote" }) %></li>
+							<li><%= Html.ActionLink("Recent", "Recent", "Quote", null, new { title = "View most recently submitted quotes" })%></li>
+							<li><%= Html.ActionLink("Best", "Best", "Quote", null, new { title = "View the top rated quotes" })%></li>
+							<li><%= Html.ActionLink("Browse", "Browse", "Quote", new { qualifiers = "" }, new { title = "Browse the quote database" })%></li>
+							<li><%= Html.ActionLink("Random", "Random", "Quote", null, new { title = "View a random quote" })%></li>
+							<li><%= Html.ActionLink("Submit", "Submit", "Quote", null, new { title = "Submit a new quote" }) %></li>
 							<% if (Model.User != null && Model.User.Group >= UserGroup.Admin) { %>
-							<li><%= Html.ActionLink("Admin", "index", "admin", null, new { title = "Perform administrative tasks" }) %></li>
+							<li><%= Html.ActionLink("Admin", "Index", "Admin", null, new { title = "Perform administrative tasks" }) %></li>
 							<% } %>
 							<li class="searchbox">
 								<%= Html.TextBox("searchQuery", null, new { id = "search-query" })%>
diff --git a/Src/VideoGameQuotes.Web/Views/Quote/PagingMenu.ascx b/Src/VideoGameQuotes.Web/Views/Shared/PagingMenu.ascx
similarity index 100%
rename from Src/VideoGameQuotes.Web/Views/Quote/PagingMenu.ascx
rename to Src/VideoGameQuotes.Web/Views/Shared/PagingMenu.ascx
diff --git a/Src/VideoGameQuotes.Web/Views/Shared/SingleQuote.ascx b/Src/VideoGameQuotes.Web/Views/Shared/SingleQuote.ascx
index 5702743..89a38f4 100644
--- a/Src/VideoGameQuotes.Web/Views/Shared/SingleQuote.ascx
+++ b/Src/VideoGameQuotes.Web/Views/Shared/SingleQuote.ascx
@@ -23,15 +23,15 @@
 			<p class="quote-details-created">
 				<span title="<%: Model.Quote.Created %>">added <%: Model.Quote.GetHumanReadableTimeSinceCreated() %></span>
 				<% if (Model.User != null && Model.User.Group >= UserGroup.Admin) { %> 
-				by <%= Html.ActionLink(Model.Quote.Creator.GetUsernameOrIp(), "edit", "user", new { usernameOrIp = Model.Quote.Creator.GetUsernameOrIp()}, null) %> 
+				by <%= Html.ActionLink(Model.Quote.Creator.GetUsernameOrIp(), "Edit", "User", new { usernameOrIp = Model.Quote.Creator.GetUsernameOrIp()}, null) %> 
 				<% } %>
 			</p>
 
 			<p class="quote-links">
 				<a class="quote-flag-icon" href="#" title="flag this quote as inaccurate, fake, spam, duplicate, etc."></a>
-				<a class="quote-permalink" href="<%= Url.Action("quote", "quote", new { id = Model.Quote.Id, text = Model.Quote.GetUrlFriendlyText() }) %>" title="permanent link to this quote"></a>
+				<a class="quote-permalink" href="<%= Url.Action("Quote", "Quote", new { id = Model.Quote.Id, text = Model.Quote.GetUrlFriendlyText() }) %>" title="permanent link to this quote"></a>
 				<% if (Model.User != null && Model.User.Group >= UserGroup.Admin) { %>
-				<a class="edit-icon" href="<%= Url.Action("edit", "quote", new { id = Model.Quote.Id }) %>" title="edit this quote"></a>
+				<a class="edit-icon" href="<%= Url.Action("Edit", "Quote", new { id = Model.Quote.Id }) %>" title="edit this quote"></a>
 				<small>(<%= Model.Quote.FlagCount %>)</small>
 				<% } %>
 			</p>
@@ -40,9 +40,9 @@
 		<div class="quote-categories">
 			<ul class="menu clearfix">
 				<li>
-					<a class="game-link" href="<%= Url.Action("browse", "quote", new { qualifiers = "game/" + Model.Quote.Game.Id }) %>" title="browse quotes from the game &quot;<%: Model.Quote.Game.Name %>&quot;">
+					<a class="game-link" href="<%= Url.Action("Browse", "Quote", new { qualifiers = "game/" + Model.Quote.Game.Id }) %>" title="browse quotes from the game &quot;<%: Model.Quote.Game.Name %>&quot;">
 					<% if (Model.Quote.Game.Icon != null) { %>
-						<img src="data:image/png;base64,<%= Model.Quote.Game.GetBase64EncodedIcon() %>" alt="icon" />
+						<img src="data:image/png;base64,<%= Model.Quote.Game.GetBase64EncodedIcon() %>" alt="" />
 					<% } %>
 						<%: Model.Quote.Game.Name %>
 					</a>
@@ -50,9 +50,9 @@
 
 			<% foreach (var system in Model.Quote.Game.Systems.OrderBy(system => system.ReleaseDate)) { %>
 				<li>
-					<a class="system-link" href="<%= Url.Action("browse", "quote", new { qualifiers = "system/" + system.Id }) %>" title="browse quotes from the system &quot;<%: system.Name %>&quot;">
+					<a class="system-link" href="<%= Url.Action("Browse", "Quote", new { qualifiers = "system/" + system.Id }) %>" title="browse quotes from the system &quot;<%: system.Name %>&quot;">
 					<% if (system.Icon != null) { %>
-						<img src="data:image/png;base64,<%= system.GetBase64EncodedIcon() %>" alt="icon" />
+						<img src="data:image/png;base64,<%= system.GetBase64EncodedIcon() %>" alt="" />
 					<% } %>
 						<%: system.Abbreviation %>
 					</a>
@@ -60,7 +60,7 @@
 			<% } %>
 
 			<% foreach (var category in Model.Quote.Categories.OrderBy(category => category.Name)) { %>
-				<li><%= Html.ActionLink(category.Name, "browse", "Quote", new { qualifiers = "category/" + category.Id }, new { title = string.Format("browse quotes categorized as \"{0}\"", category.Name) })%></li>
+				<li><%= Html.ActionLink(category.Name, "Browse", "Quote", new { qualifiers = "category/" + category.Id }, new { title = string.Format("browse quotes categorized as \"{0}\"", category.Name) })%></li>
 			<% } %>
 			</ul>
 		</div>
diff --git a/Src/VideoGameQuotes.Web/Views/Shared/Site.Master b/Src/VideoGameQuotes.Web/Views/Shared/Site.Master
index bad7533..39679de 100644
--- a/Src/VideoGameQuotes.Web/Views/Shared/Site.Master
+++ b/Src/VideoGameQuotes.Web/Views/Shared/Site.Master
@@ -35,12 +35,12 @@
 			<div id="footer">
 				<p>
 					&copy; <%= DateTime.UtcNow.Year %> <a href="http://tommymontgomery.com/" title="Who is this man?">Tommy Montgomery</a><br />
-					<%= Html.ActionLink("about", "about", "home") %> | 
-					<%= Html.ActionLink("credits", "about", "home", null, null, "credits", null, null) %> |
+					<%= Html.ActionLink("about", "About", "Home") %> | 
+					<%= Html.ActionLink("credits", "About", "Home", null, null, "credits", null, null) %> |
 					<% if (!Request.IsAuthenticated) { %>
 					<a href="#" id="login-link">login</a>
 					<% } else { %>
-					<%= Html.ActionLink("logout", "logout", "home", new { redirectUrl = Request.Path }, null)%>
+					<%= Html.ActionLink("logout", "Logout", "Home", new { redirectUrl = Request.Path }, null)%>
 					<% } %>
 				</p>
 			</div>
diff --git a/Src/VideoGameQuotes.Web/Web.config b/Src/VideoGameQuotes.Web/Web.config
index a5e66a0..11d9b87 100644
--- a/Src/VideoGameQuotes.Web/Web.config
+++ b/Src/VideoGameQuotes.Web/Web.config
@@ -12,7 +12,7 @@
 			<container>
 				<extensions>
 					<add type="VideoGameQuotes.Web.Configuration.EnableLogging, VideoGameQuotes.Web"/>
-					<!--<add type="Portoa.Web.Unity.LogAllMethodCalls, Portoa.Web"/>-->
+					<add type="Portoa.Web.Unity.LogAllMethodCalls, Portoa.Web"/>
 					<add type="VideoGameQuotes.Web.Configuration.EnableSearchWithLucene, VideoGameQuotes.Web"/>
 				</extensions>
 			</container>