diff --git a/pages/merlin6/02 accessing-merlin6/nomachine.md b/pages/merlin6/02 accessing-merlin6/nomachine.md
index 4457b86..038e056 100644
--- a/pages/merlin6/02 accessing-merlin6/nomachine.md	
+++ b/pages/merlin6/02 accessing-merlin6/nomachine.md	
@@ -38,43 +38,59 @@ NoMachine service running on a login node.
 
 ### Creating a new connection
 
-Open the NoMachine client and create a **New** connection:
+#### Create a **New** connection
+
+Click on the **New** button to create a new connection:
 
 ![Create New NoMachine Connection]({{ "/images/NoMachine/screen_nx1.png" }})
 
-Select **NX** protocol and **Continue**:
+#### Configure **NX** protocol
 
 ![Select NoMachine Protocol]({{ "/images/NoMachine/screen_nx2.png" }})
 
+#### Configure NoMachine Server Information
+
 Select the corresponding login node server where the NoMachine service is running and
 keep **4000** as the listening port; then **Continue**. 
 
 ![Configure NoMachine Server Information]({{ "/images/NoMachine/screen_nx3.png" }})
 
+#### Configure NoMachine Authentication
+
 Choose your authentication method and **Continue**. **Password** or *Kerberos* are the recommended ones:
 
 ![Configure NoMachine Authentication Method]({{ "/images/NoMachine/screen_nx4.png" }})
 
-**Don't use a proxy**, and **Continue**:
+#### Configure Proxy
+
+In Merlin6, we will check **Don't use a proxy**, and **Continue**:
 
 ![Configure NoMachine Proxy Information]({{ "/images/NoMachine/screen_nx5.png" }})
 
-Finally add a name for your connection. We strongly recommend to add the hostname of the login node, but
-you are free to choose any other name:
+#### Configure Connection Name
+
+We strongly recommend to add the login node hostname, but
+you are free to choose any other name for your connection:
 
 ![Configure Connection Name]({{ "/images/NoMachine/screen_nx6.png" }})
 
 ### Connecting to a NoMachine existing connection
 
+#### Connect to a Merlin6 NoMachine Server
+
 Double click on the NoMachine server in order to connect to it:
 
 ![Connect to a NoMachine existing connecion]({{ "/images/NoMachine/screen_nx7.png" }})
 
+#### Authenticate (whenever necessary)
+
 If authentication is required, you will be asked for it. The example below corresponds to **Password** 
 authentication:
 
 ![NoMachine Authentication]({{ "/images/NoMachine/screen_nx8.png" }})
 
+#### Create/Re-Connect Virtual Desktop
+
 Finally, create a virtual desktop in order to get in. If a previous virtual desktop was created, you 
 might be able to re-attach the session. 
 
@@ -84,6 +100,8 @@ Some hints of how to manage the resolution and windows will be shown.
 
 ![NoMachine Resolution/Window Management Hints]({{ "/images/NoMachine/screen_nx10.png" }})
 
+### NoMachine LightDM Session Example
+
 An example of the NoMachine session, which is based on [LightDM](https://github.com/canonical/lightdm)
 X Windows: