diff --git a/PlatformSamples/AspNetCoreMvc/Controllers/HomeController.cs b/PlatformSamples/AspNetCoreMvc/Controllers/HomeController.cs
index 11687ab..d8433eb 100644
--- a/PlatformSamples/AspNetCoreMvc/Controllers/HomeController.cs
+++ b/PlatformSamples/AspNetCoreMvc/Controllers/HomeController.cs
@@ -18,33 +18,16 @@ namespace AspNetCoreMvc.Controllers
             return View ();
         }
 
-        public IActionResult Clicker ()
-        {
-            var count = 0;
-            var head = new Heading { Text = "Click away!" };
-            var label = new Label { Text = "0" };
-            var btn = new Button { Text = "Increase" };
-            btn.Clicked += (sender, e) => {
-                count++;
-                label.Text = count.ToString ();
-            };
-            var div = new Div ();
-            div.AppendChild (head);
-            div.AppendChild (label);
-            div.AppendChild (btn);
-            return new ElementResult (div);
-        }
-
         public IActionResult About ()
         {
-            ViewData["Message"] = "Your application description page.";
+            ViewData["Message"] = "Ooui is a mini web framework to make programming interactive UIs easy.";
 
             return View ();
         }
 
         public IActionResult Contact ()
         {
-            ViewData["Message"] = "Your contact page.";
+            ViewData["Message"] = "Find us on github.";
 
             return View ();
         }
diff --git a/PlatformSamples/AspNetCoreMvc/Controllers/SamplesController.cs b/PlatformSamples/AspNetCoreMvc/Controllers/SamplesController.cs
index 3503207..fc46088 100644
--- a/PlatformSamples/AspNetCoreMvc/Controllers/SamplesController.cs
+++ b/PlatformSamples/AspNetCoreMvc/Controllers/SamplesController.cs
@@ -35,7 +35,11 @@ namespace AspNetCoreMvc.Controllers
                 var sampleType = typeof (Samples.ISample);
                 var asm = sampleType.Assembly;
                 var sampleTypes = asm.GetTypes ().Where (x => x.Name.EndsWith ("Sample", StringComparison.Ordinal) && x != sampleType);
-                var samples = from t in sampleTypes let s = Activator.CreateInstance (t) as Samples.ISample where s != null select s;
+                var samples = from t in sampleTypes
+                              let s = Activator.CreateInstance (t) as Samples.ISample
+                              where s != null
+                              orderby s.Title
+                              select s;
                 return samples.ToList ();
             }), true);
 
diff --git a/PlatformSamples/AspNetCoreMvc/Views/Home/About.cshtml b/PlatformSamples/AspNetCoreMvc/Views/Home/About.cshtml
index a443e8b..c9f4798 100644
--- a/PlatformSamples/AspNetCoreMvc/Views/Home/About.cshtml
+++ b/PlatformSamples/AspNetCoreMvc/Views/Home/About.cshtml
@@ -4,4 +4,4 @@
 <h2>@ViewData["Title"].</h2>
 <h3>@ViewData["Message"]</h3>
 
-<p>Use this area to provide additional information.</p>
+<p>Find out more <a href="https://github.com/praeclarum/Ooui">on github</a></p>
diff --git a/PlatformSamples/AspNetCoreMvc/Views/Home/Contact.cshtml b/PlatformSamples/AspNetCoreMvc/Views/Home/Contact.cshtml
index 9d10bf9..d1ef9c9 100644
--- a/PlatformSamples/AspNetCoreMvc/Views/Home/Contact.cshtml
+++ b/PlatformSamples/AspNetCoreMvc/Views/Home/Contact.cshtml
@@ -4,14 +4,3 @@
 <h2>@ViewData["Title"].</h2>
 <h3>@ViewData["Message"]</h3>
 
-<address>
-    One Microsoft Way<br />
-    Redmond, WA 98052-6399<br />
-    <abbr title="Phone">P:</abbr>
-    425.555.0100
-</address>
-
-<address>
-    <strong>Support:</strong> <a href="mailto:Support@example.com">Support@example.com</a><br />
-    <strong>Marketing:</strong> <a href="mailto:Marketing@example.com">Marketing@example.com</a>
-</address>
diff --git a/PlatformSamples/AspNetCoreMvc/Views/Home/Index.cshtml b/PlatformSamples/AspNetCoreMvc/Views/Home/Index.cshtml
index 53b984e..baebc52 100644
--- a/PlatformSamples/AspNetCoreMvc/Views/Home/Index.cshtml
+++ b/PlatformSamples/AspNetCoreMvc/Views/Home/Index.cshtml
@@ -13,7 +13,7 @@
 </div>
 
 <div class="row" style="margin-top:4em;">
-    <div class="col-md-3">
+    <div class="col-md-4">
         <h3>Samples</h3>
         <ul>
 			@foreach (var s in SamplesController.Samples) {
diff --git a/PlatformSamples/AspNetCoreMvc/Views/Shared/_Layout.cshtml b/PlatformSamples/AspNetCoreMvc/Views/Shared/_Layout.cshtml
index 25513d3..ae68cea 100644
--- a/PlatformSamples/AspNetCoreMvc/Views/Shared/_Layout.cshtml
+++ b/PlatformSamples/AspNetCoreMvc/Views/Shared/_Layout.cshtml
@@ -32,7 +32,6 @@
                 <ul class="nav navbar-nav">
                     <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
                     <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
                 </ul>
             </div>
         </div>
diff --git a/Samples/ButtonSample.cs b/Samples/ButtonSample.cs
index 2a2d685..455499a 100644
--- a/Samples/ButtonSample.cs
+++ b/Samples/ButtonSample.cs
@@ -5,7 +5,7 @@ namespace Samples
 {
     public class ButtonSample : ISample
     {
-        public string Title => "Button that count clicks";
+        public string Title => "Button Counter";
 
         Button MakeButton ()
         {
diff --git a/Samples/DrawSample.cs b/Samples/DrawSample.cs
index e6db2bd..5e70226 100644
--- a/Samples/DrawSample.cs
+++ b/Samples/DrawSample.cs
@@ -7,7 +7,7 @@ namespace Samples
 {
     public class DrawSample : ISample
     {
-        public string Title => "Collaborative Drawing";
+        public string Title => "Drawing";
 
         public void Publish ()
         {
diff --git a/Samples/FilesSample.cs b/Samples/FilesSample.cs
index d1bdfa8..fbb05d5 100644
--- a/Samples/FilesSample.cs
+++ b/Samples/FilesSample.cs
@@ -6,7 +6,7 @@ using Ooui;
 
 namespace Samples
 {
-    public class FilesSample : ISample
+    public class FilesSample //: ISample
 	{
         public string Title => "Upload files";
 
diff --git a/Samples/TodoSample.cs b/Samples/TodoSample.cs
index 7f58ac7..42e1faa 100644
--- a/Samples/TodoSample.cs
+++ b/Samples/TodoSample.cs
@@ -7,7 +7,7 @@ namespace Samples
 {
     public class TodoSample : ISample
     {
-        public string Title => "Global TODO list";
+        public string Title => "Todo List";
 
         List items = new List () {
             ClassName = "list-group",