diff --git a/docs.it4i/general/accessing-the-clusters/graphical-user-interface/vnc.md b/docs.it4i/general/accessing-the-clusters/graphical-user-interface/vnc.md
index ce7e0a84c7cc8808729f0546946d32616b6f6af1..986502bdac3459063d0d61bf74096149d2a9d34a 100644
--- a/docs.it4i/general/accessing-the-clusters/graphical-user-interface/vnc.md
+++ b/docs.it4i/general/accessing-the-clusters/graphical-user-interface/vnc.md
@@ -76,7 +76,7 @@ username :102
 ```
 
 !!! note
-    The VNC server runs on port 59xx, where xx is the display number. So, you get your port number simply as 5900 + display number, in our example 5900 + 61 = 5961. Another example for display number 102 is calculation of TCP port 5900 + 102 = 6002. **Please, calculate your own port number and use it instead of 5961 from examples below!**
+    The VNC server runs on port 59xx, where xx is the display number. So, you get your port number simply as 5900 + display number, in our example 5900 + 61 = 5961. Another example for display number 102 is calculation of TCP port 5900 + 102 = 6002 but be aware, that TCP ports above 6000 are often used by X11. **Please, calculate your own port number and use it instead of 5961 from examples below!**
 
 To access the VNC server you have to create a tunnel between the login node using TCP port 5961 and your machine using a free TCP port (for simplicity the very same) in next step. See examples for [Linux/Mac OS](#linuxmac-os-example-of-creating-a-tunnel) and [Windows](#windows-example-of-creating-a-tunnel).
 
diff --git a/docs.it4i/general/accessing-the-clusters/graphical-user-interface/x-window-system.md b/docs.it4i/general/accessing-the-clusters/graphical-user-interface/x-window-system.md
index fd24099552c23b8c56be5b0c995d0f0995b19744..1f87d62a5dfca725eab102db7c9cfbc0b5958866 100644
--- a/docs.it4i/general/accessing-the-clusters/graphical-user-interface/x-window-system.md
+++ b/docs.it4i/general/accessing-the-clusters/graphical-user-interface/x-window-system.md
@@ -7,13 +7,15 @@ The X Window system is a principal way to get GUI access to the clusters. The **
 
 ## X Display
 
-In order to display graphical user interface GUI of various software tools, you need to enable the X display forwarding. On Linux and Mac, log in using the -X option tho ssh client:
+### Linux Example
+
+In order to display graphical user interface GUI of various software tools, you need to enable the X display forwarding. On Linux and Mac, log in using the -X option in ssh client:
 
 ```console
  local $ ssh -X username@cluster-name.it4i.cz
 ```
 
-## X Display Forwarding on Windows
+### PuTTY on Windows
 
 On Windows use the PuTTY client to enable X11 forwarding. In PuTTY menu, go to Connection-SSH-X11, mark the Enable X11 forwarding checkbox before logging in.
 
@@ -21,6 +23,23 @@ On Windows use the PuTTY client to enable X11 forwarding. In PuTTY menu, go to C
 
 Then log in as usual.
 
+### WSL (Bash on Windows)
+
+In order to display graphical user interface GUI of various software tools, you need to enable the X display forwarding. Log in using the -X option in ssh client:
+
+```console
+ local $ ssh -X username@cluster-name.it4i.cz
+```
+
+!!! tip
+    If you are getting error message "cannot open display", then try to export DISPLAY variable, before attempting to log in:
+
+```console
+ local $ export DISPLAY=localhost:0.0
+```
+
+## Verify the Forwarding
+
 To verify the forwarding, type
 
 ```console
@@ -39,11 +58,11 @@ then the X11 forwarding is enabled.
 
 In order to display graphical user interface GUI of various software tools, you need running X server on your desktop computer. For Linux users, no action is required as the X server is the default GUI environment on most Linux distributions. Mac and Windows users need to install and run the X server on their workstations.
 
-## X Server on OS X
+### X Server on OS X
 
 Mac OS users need to install [XQuartz server](https://www.xquartz.org).
 
-## X Server on Windows
+### X Server on Windows
 
 There are variety of X servers available for Windows environment. The commercial Xwin32 is very stable and rich featured. The Cygwin environment provides fully featured open-source XWin X server. For simplicity, we recommend open-source X server by the [Xming project](http://sourceforge.net/projects/xming/). For stability and full features we recommend the
 [XWin](http://x.cygwin.com/) X server by Cygwin
@@ -94,7 +113,7 @@ In this example, we log in on the r24u35n680 compute node, with the X11 forwardi
 
 The Gnome 2.28 GUI environment is available on the clusters. We recommend to use separate X server window for displaying the Gnome environment.
 
-## Gnome on Linux and OS X
+### Gnome on Linux and OS X
 
 To run the remote Gnome session in a window on Linux/OS X computer, you need to install Xephyr. Ubuntu package is
 xserver-xephyr, on OS X it is part of [XQuartz](http://xquartz.macosforge.org/landing/). First, launch Xephyr on local machine:
@@ -120,11 +139,11 @@ xinit /usr/bin/ssh -XT -i .ssh/path_to_your_key yourname@cluster-namen.it4i.cz g
 However this method does not seem to work with recent Linux distributions and you will need to manually source
 /etc/profile to properly set environment variables for PBS.
 
-## Gnome on Windows
+### Gnome on Windows
 
 Use XLaunch to start the Xming server or run the XWin.exe. Select the "One window" mode.
 
-Log in to the cluster, using PuTTY. On the cluster, run the gnome-session command.
+Log in to the cluster, using [PuTTY](#putty-on-windows) or [Bash on Windows](#wsl-bash-on-windows). On the cluster, run the gnome-session command.
 
 ```console
 $ gnome-session &