diff --git a/JsonDataContextDriver/Inputs/JsonFileInput.cs b/JsonDataContextDriver/Inputs/JsonFileInput.cs
index 5b3878a..6a8a0f3 100644
--- a/JsonDataContextDriver/Inputs/JsonFileInput.cs
+++ b/JsonDataContextDriver/Inputs/JsonFileInput.cs
@@ -57,9 +57,9 @@ public override string ToString()
             switch (InputType)
             {
                 case JsonInputType.File:
-                    return InputPath;
+                    return String.Format("{1}: {0}", InputPath, Path.GetFileNameWithoutExtension(InputPath));
                 case JsonInputType.Directory:
-                    return Path.Combine(InputPath, Mask ?? "*.*") + (Recursive ? " + subfolders" : "");
+                    return String.Format("Search Folder: {0}", Path.Combine(InputPath, Mask ?? "*.*") + (Recursive ? " + subfolders" : ""));
                 default:
                     return "ERR";
             }
diff --git a/JsonDataContextDriver/Inputs/JsonUrlInput.cs b/JsonDataContextDriver/Inputs/JsonUrlInput.cs
index 8bdf7fa..fb48f38 100644
--- a/JsonDataContextDriver/Inputs/JsonUrlInput.cs
+++ b/JsonDataContextDriver/Inputs/JsonUrlInput.cs
@@ -203,8 +203,10 @@ private static string ToLiteral(string input)
 
         public override string ToString()
         {
+            var uri = new Uri(Url);
+
             return GenerateAsMethod
-                ? String.Format("{0}: {1} with parameters ({2})", this.Name, new Uri(this.Url).AbsolutePath,
+                ? String.Format("{0}: {1} with parameters ({2})", this.Name, uri.Host+uri.AbsolutePath,
                     String.Join(", ", GetUrlQueryStringParameters().Select(p => p.Item1)))
                 : String.Format("{0}: {1}", this.Name, this.Url);
         }
diff --git a/README.md b/README.md
index 0c0facc..56b79cb 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ This driver allows you to select a set of JSON inputs from which a LINQPad data
 
 ####Screenshots
 
-![](http://ryandavis.io/content/images/2015/06/cxn_dialog.png)
-![](http://ryandavis.io/content/images/2015/06/json_context-1.png)
+![](http://ryandavis.io/content/images/2015/06/json_connection_dialog_updated.png)
+![](http://ryandavis.io/content/images/2015/06/json_query-1.png)
 
 ####Planned Features: