diff --git a/docs/get-started/test-drive/create-a-project.md b/docs/get-started/test-drive/create-a-project.md
index 37a9d7754..b310a0c41 100644
--- a/docs/get-started/test-drive/create-a-project.md
+++ b/docs/get-started/test-drive/create-a-project.md
@@ -53,19 +53,15 @@ The template will create a new solution and project.
   <TabItem value="vs" label="Visual Studio">
 
 - In **Visual Studio**, click **Create a new project**.
-- Type `Avalonia` in the search box.
-- Click **Avalonia Application** then click **Next**.
+- Type `Avalonia MVVM` in the search box.
+- Click **Avalonia .NET MVVM App** then click **Next**.
 
 <img className="center" src={VsFindAvaloniaTemplateScreenshot} />
 
-- Name the project `GetStartedApp`, and click **Create**.
-
-- The next screen allows selecting the platforms you wish to target: click **Desktop** then click **Next**.
-
-- The next screen allows selecting a design pattern: click **ReactiveUI** then click **Create**.
-
-The template will create a new solution and two new projects. `GetStartedApp` is the main project that is shared between each platform. `GetStartedApp.Desktop` is the platform-specific project for the desktop platform.
+- Name the project `GetStartedApp`, and click **Next**.
 
+- The next screen allows selecting a design pattern: select **ReactiveUI** as the MVVM Toolkit then click **Create**.
+- The template will create a new solution and project.
 <img className="center" src={VsNewAvaloniaProjectScreenshot} />
 
   </TabItem>
@@ -91,9 +87,6 @@ Press the **Run** button in the Rider toolbar:
 
   </TabItem>
   <TabItem value="vs" label="Visual Studio">
-
-  Right-click on the `GetStartedApp.Desktop` project and select **Set as Startup Project**.
-
   Hit `F5` to run the project.
 
   </TabItem>
diff --git a/docs/get-started/test-drive/main-window.md b/docs/get-started/test-drive/main-window.md
index 301745cff..c1b7d7f96 100644
--- a/docs/get-started/test-drive/main-window.md
+++ b/docs/get-started/test-drive/main-window.md
@@ -50,11 +50,13 @@ There may be a red exclamation icon (top left) and the message **The designer is
 :::
 
 - Build the project.
-- Scroll the preview pane to the left to view the preview outline and the text displayed in the top left corner.
+- You will see a preview of the greeting message in the center of the designer section.
 
 <img className="center" src={VsPreviewPaneScreenshot} alt="" />
 
-- Remove the binding `{Binding Greeting}` and change the text `<TextBlock Text="`my text`" ...`
+- Remove the binding `{Binding Greeting}` and change the value of the text attribute, e.g.
+
+    `<TextBlock Text="Hello world!" .../>`
 
 You will see the new text in the preview pane change as you type. This is an example of the Avalonia **design-time preview behaviour** that will help you develop user interface presentation accurately and quickly.
 
diff --git a/docs/get-started/test-drive/response-to-an-event.md b/docs/get-started/test-drive/response-to-an-event.md
index 1873b0af4..87e646d64 100644
--- a/docs/get-started/test-drive/response-to-an-event.md
+++ b/docs/get-started/test-drive/response-to-an-event.md
@@ -44,7 +44,7 @@ The partial class `MainWindow` corresponds to the window object that is created
 ```xml
 <Window 
     ...
-    x:Class="GetStartedApp.MainWindow" >
+    x:Class="GetStartedApp.Views.MainWindow" >
 </Window>
 ```
 
@@ -83,7 +83,7 @@ If you're using an IDE you will see the Avalonia UI Intellisense as you type.
 <img className="center" src={ButtonIntellisenseClickScreenshot} alt="" />
 :::
 
-- Run the app and click the button.
+- Run the app (in debug mode) and click the button.
 
 You should see the result on the Output window for Debug, like this:
 
diff --git a/docs/get-started/test-drive/the-design-preview.md b/docs/get-started/test-drive/the-design-preview.md
index b1ddaa552..93699ee5b 100644
--- a/docs/get-started/test-drive/the-design-preview.md
+++ b/docs/get-started/test-drive/the-design-preview.md
@@ -15,7 +15,7 @@ Examine the XAML for the `<Window>` tag. It will look like this:
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="550"
-        x:Class="GetStartedApp.MainWindow"
+        x:Class="GetStartedApp.Views.MainWindow"
         Title="GetStartedApp">
 ```
 
diff --git a/static/img/get-started/test-drive/vs-find-avalonia-template-screenshot.png b/static/img/get-started/test-drive/vs-find-avalonia-template-screenshot.png
index 8a6682032..a81f0cc73 100644
Binary files a/static/img/get-started/test-drive/vs-find-avalonia-template-screenshot.png and b/static/img/get-started/test-drive/vs-find-avalonia-template-screenshot.png differ
diff --git a/static/img/get-started/test-drive/vs-new-avalonia-project-screenshot.png b/static/img/get-started/test-drive/vs-new-avalonia-project-screenshot.png
index 2dd475129..7d86e1b96 100644
Binary files a/static/img/get-started/test-drive/vs-new-avalonia-project-screenshot.png and b/static/img/get-started/test-drive/vs-new-avalonia-project-screenshot.png differ
diff --git a/static/img/get-started/test-drive/vs-preview-pane.png b/static/img/get-started/test-drive/vs-preview-pane.png
index 298fca4ad..8e2bc4a3a 100644
Binary files a/static/img/get-started/test-drive/vs-preview-pane.png and b/static/img/get-started/test-drive/vs-preview-pane.png differ
diff --git a/static/img/get-started/test-drive/vs-previewer.png b/static/img/get-started/test-drive/vs-previewer.png
index 52459994a..cd2fc4dd9 100644
Binary files a/static/img/get-started/test-drive/vs-previewer.png and b/static/img/get-started/test-drive/vs-previewer.png differ