diff --git a/1-gui/README.md b/0-gui/README.md
similarity index 65%
rename from 1-gui/README.md
rename to 0-gui/README.md
index 541631c6a100f12014fb7d983dbaeca515d36a49..ee25d0308b8d44bac845a0a6b0534f8e0d44ee12 100644
--- a/1-gui/README.md
+++ b/0-gui/README.md
@@ -1,13 +1,11 @@
-# Using OpenStack's Web Interface
+# Using OpenStack's Graphical User Interface
 
-This introduction is intended for users that want to start a larger number of virtual machine instances in the cloud or use advanced features through the Graphical User Interface of OpenStack.
+This introduction is intended for users wanting to start a virtual machine instance
+through the Graphical User Interface of OpenStack.
 
-The process is similar to creating a virtual machine instance in [Quickstart](/documentation/0-quickstart/), you need to
-* sign in via the MetaCentrum Cloud web interface,
+Overview of necessary steps:
+* sign in via OpenStack's Graphical User Interface - Horizon Dashboard,
 * create an *ssh* key pair or use an existing key pair,
-* create virtual private network,
-* create virtual router,
-* join virtual private network to internet through router interfaces,
 * set up or update a security group,
 * start a virtual machine instance,
 * allocate floating IP address (add or remove IP address to/from virtual machine instance)
@@ -16,185 +14,157 @@ The process is similar to creating a virtual machine instance in [Quickstart](/d
 
 ## Sign In
 
-The web interface is available at [https://cloud.muni.cz](https://cloud.muni.cz).
+The Graphical User Interface is available at [https://dashboard.cloud.muni.cz](https://dashboard.cloud.muni.cz).
 
 To sign in,
 * select `ENIFRA CESNET`,
 * click on `Sign In`,
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/sign_in1.png)
-{% endreveal %}
+
+  ![](/0-gui/images/sign_in1.png)
+
 * select your institution from the drop-down list (use the search box at the top as a filter),
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/sign_in2.png)
-{% endreveal %}
+
+  ![](/0-gui/images/sign_in2.png)
+
 * provide your institution-specific sign-in credentials,
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/sign_in3.png)
-{% endreveal %}
-* wait to be redirected back to our web interface.
+
+  ![](/0-gui/images/sign_in3.png)
+
+* wait to be redirected back to our Graphical User Interface.
 
 ## Create Key Pair
 
-All virtual machine instances running in the cloud have to be accessed remotely. The most common way of accessing a virtual machine instance remotely is the secure shell - *ssh*. Using *ssh* requires a pair of cryptographic keys.
+All virtual machine instances running in the cloud have to be accessed remotely. The most common way of accessing
+a virtual machine instance remotely is *ssh*. Using *ssh* requires a pair of keys - a public key and a private key.
 
 1. To create a new *ssh* key pair, go to **Project > Compute > Key Pairs** and click the button "Create Key Pair"
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/CreateKeyPair1.png)
-{% endreveal %}
+
+  ![](/0-gui/images/CreateKeyPair1.png)
 
 2. Name your new key and click on "Create Key Pair" again. Avoid using special characters, if possible.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/CreateKeyPair2.png)
-{% endreveal %}
+
+  ![](/0-gui/images/CreateKeyPair2.png)
 
 3. You can see your newly created key pair and its fingerprint. We recommend you store the key in a safe location and back it up in case you accidentally delete it.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/CreateKeyPair3.png)
-{% endreveal %}
+
+  ![](/0-gui/images/CreateKeyPair3.png)
 
 ## Create Network
 
 1. In **Project > Network > Network Topology** you can see the actual status of your networks. In the beginning there are only public networks visible, because you haven't created yet your network. You can do it by clicking on the button "Create Network". This network will serve as connection of your instances.
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/network1.png)
-{% endreveal %}
+
+  ![](/0-gui/images/network1.png)
 
 2. Name the network, which will join your instances, and click "Next".
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/network2.png)
-{% endreveal %}
+
+  ![](/0-gui/images/network2.png)
 
 3. In Subnet tab name your subnet and choose a range of valid IP addresses (e.g. 10.1.1.0/24 or whatever you wanti) in CIDR format. The gateway will be automatically added as default (in our example it would be 10.1.1.1). Click "Next".
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/network3.png)
-{% endreveal %}
+
+  ![](/0-gui/images/network3.png)
 
 4. In Subnet Details tab in Allocation Pools you can choose what ranges will be served by DHCP server (what ranges will be automatically assigned if a machine will use DHCP server for joining a subnet). Use format in description (e.g. for range between 10.1.1.220 and 10.1.1.249 write: 10.1.1.220,10.1.1.249 - so limits separated by comma). You can leave default DNS servers. Click "Create".
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/network4.png)
-{% endreveal %}
+
+  ![](/0-gui/images/network4.png)
 
 5. Now in **Project > Network > Network Topology** you should see the new network created by you.
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/network5.png)
-{% endreveal %}
+
+  ![](/0-gui/images/network5.png)
 
    Now you can continue by creating router.
 
 ## Create Router
 
 1. In **Project > Network > Network Topology** or in **Project > Network > Routers** push the button "Create Router". This router will serve as connection between your subnet and public network.
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/router1.png)
-{% endreveal %}
+
+  ![](/0-gui/images/router1.png)
 
 2. Add router name, select External Network (public network, through which you will be connected to internet) and click "Create Router". The router should be created and joined to public network.
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/router2.png)
-{% endreveal %}
+
+  ![](/0-gui/images/router2.png)
 
 3. In **Project > Network > Network Topology** the router should be now visible.
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/router3.png)
-{% endreveal %}
+
+  ![](/0-gui/images/router3.png)
 
 4. Now you can go to **Project > Network > Network Topology** and create interface for connection to your subnet. Pointing over the router icon you will get to information window, where is a button "Add Interface". Click on it.
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/router4.png)
-{% endreveal %}
+
+  ![](/0-gui/images/router4.png)
 
 5. In opened pop-up window choose the available subnet. Click "Submit".
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/router5.png)
-{% endreveal %}
+
+  ![](/0-gui/images/router5.png)
 
 6. In **Project > Network > Network Topology** you can now see your network joined to public network.
-{% reveal text="Show Screenshot" %}
-  ![](/1-gui/router6.png)
-{% endreveal %}
+
+  ![](/0-gui/images/router6.png)
 
 ## Create Virtual Machine Instance(s)
 
 The creation of virtual machine instances is very straight-forward:
 1. In **Compute > Instances** push the button "Launch Instance"
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance0.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance0.png)
 
 2. Choose Instance Name, (optionally) Description, Availability Zone and Count of instances, how many VMs you want to create. If you are creating more instances, the number in format '-X' will be added automatically to the Instance Name for each instance.
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance1.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance1.png)
 
 3. Choose the source of booting (you can boot your Instances from Image or a snapshot), Volume Size and from Available choose the desired image to boot from. According to the purpose of your project you can change these default settings Create New Volume and Delete Volume on Instance Delete (default "No"), if you want to use created volume and if you want to have not persistant volume.
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance2.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance2.png)
 
 4. Pick the flavour - size of Instances created: VCPUs, RAM, Total Disk (Root). There are a few possibilities to choose from. You can add [additional disk]() later.
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance3.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance3.png)
 
 5. Next you check if your Instances were added to network created earlier
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance4.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance4.png)
 
 6. (optional) Security Groups tab you can see to what security group instances will be added. Usually you would like to stick with default option. Click on "Next".
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance5.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance5.png)
 
 7. In Key Pair you need to add your earlier created public key. It will be added to authorized keys on instances and will allow you to ssh access to them from terminal/Putty or whatever you are using as ssh tool for connecting.
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance6.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance6.png)
 
 8. (optional) You can now go to Metadata (the left bottom tab) and choose the packages of software, which you want to have installed on your instances.
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance7.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance7.png)
 
 9. Then you can click on Launch Instance. After a few minutes they will be ready for using.
-{% reveal text="Show Screenshot" %}
-![](/1-gui/instance8.png)
-{% endreveal %}
+
+  ![](/0-gui/images/instance8.png)
 
 ## Allocate and Associate a Floating IP (optional)
 
 Sometimes we want to have an instance accessible from public network. In OpenStack project you can do it easily from the menu for each instance in **Project > Compute > Instances** or you can manage them more conscious way with at first allocating and then associating of IP address with instance. (You can of course later disassociate IP address from instance or disallocate IP address from your pool, when you don't need it, or associate with another instance and so on.)
 
 1. Go to **Project > Network > Floating IPs** and click on "Allocate IP to Project"
-{% reveal text="Show Screenshot" %}
-![](/1-gui/allocate_IP0.png)
-{% endreveal %}
+
+  ![](/0-gui/images/allocate_IP0.png)
 
 2. In pop-up window choose from which public network (Pool) do you want to allocate IP address for your instance eventually what will be the name of IP address. You have to choose the public network, to which your network is connected to, otherwise it won't work. Click on "Allocate".
-{% reveal text="Show Screenshot" %}
-![](/1-gui/allocate_IP1.png)
-{% endreveal %}
+
+  ![](/0-gui/images/allocate_IP1.png)
 
 3. Now you should have IP address to your disposal.
-{% reveal text="Show Screenshot" %}
-![](/1-gui/allocate_IP2.png)
-{% endreveal %}
+
+  ![](/0-gui/images/allocate_IP2.png)
 
 4. The next step is associate the free IP address to an instance. Click on "Associate".
-{% reveal text="Show Screenshot" %}
-![](/1-gui/allocate_IP2a.png)
-{% endreveal %}
+
+  ![](/0-gui/images/allocate_IP2a.png)
 
 5. Select IP address and Port to be associated and click on "Associate".
-{% reveal text="show screenshot" %}
-![](/1-gui/allocate_IP3.png)
-{% endreveal %}
+
+  ![](/0-gui/images/allocate_IP3.png)
 
 6. In **Project > Compute > Instances** you should be able to see instance with the associated public IP address.
-{% reveal text="show screenshot" %}
-![](/1-gui/allocate_IP4.png)
-{% endreveal %}
+
+  ![](/0-gui/images/allocate_IP4.png)
 
 ## Create Volume
 > TODO
diff --git a/0-quickstart/CreateKeyPair1.png b/0-gui/images/CreateKeyPair1.png
similarity index 100%
rename from 0-quickstart/CreateKeyPair1.png
rename to 0-gui/images/CreateKeyPair1.png
diff --git a/0-quickstart/CreateKeyPair2.png b/0-gui/images/CreateKeyPair2.png
similarity index 100%
rename from 0-quickstart/CreateKeyPair2.png
rename to 0-gui/images/CreateKeyPair2.png
diff --git a/0-quickstart/CreateKeyPair3.png b/0-gui/images/CreateKeyPair3.png
similarity index 100%
rename from 0-quickstart/CreateKeyPair3.png
rename to 0-gui/images/CreateKeyPair3.png
diff --git a/0-quickstart/SecurityGroups1.png b/0-gui/images/SecurityGroups1.png
similarity index 100%
rename from 0-quickstart/SecurityGroups1.png
rename to 0-gui/images/SecurityGroups1.png
diff --git a/0-quickstart/SecurityGroups2.png b/0-gui/images/SecurityGroups2.png
similarity index 100%
rename from 0-quickstart/SecurityGroups2.png
rename to 0-gui/images/SecurityGroups2.png
diff --git a/0-quickstart/SecurityGroups3.png b/0-gui/images/SecurityGroups3.png
similarity index 100%
rename from 0-quickstart/SecurityGroups3.png
rename to 0-gui/images/SecurityGroups3.png
diff --git a/1-gui/allocate_IP0.png b/0-gui/images/allocate_IP0.png
similarity index 100%
rename from 1-gui/allocate_IP0.png
rename to 0-gui/images/allocate_IP0.png
diff --git a/1-gui/allocate_IP1.png b/0-gui/images/allocate_IP1.png
similarity index 100%
rename from 1-gui/allocate_IP1.png
rename to 0-gui/images/allocate_IP1.png
diff --git a/1-gui/allocate_IP2.png b/0-gui/images/allocate_IP2.png
similarity index 100%
rename from 1-gui/allocate_IP2.png
rename to 0-gui/images/allocate_IP2.png
diff --git a/1-gui/allocate_IP2a.png b/0-gui/images/allocate_IP2a.png
similarity index 100%
rename from 1-gui/allocate_IP2a.png
rename to 0-gui/images/allocate_IP2a.png
diff --git a/1-gui/allocate_IP3.png b/0-gui/images/allocate_IP3.png
similarity index 100%
rename from 1-gui/allocate_IP3.png
rename to 0-gui/images/allocate_IP3.png
diff --git a/1-gui/allocate_IP4.png b/0-gui/images/allocate_IP4.png
similarity index 100%
rename from 1-gui/allocate_IP4.png
rename to 0-gui/images/allocate_IP4.png
diff --git a/1-gui/instance0.png b/0-gui/images/instance0.png
similarity index 100%
rename from 1-gui/instance0.png
rename to 0-gui/images/instance0.png
diff --git a/1-gui/instance1.png b/0-gui/images/instance1.png
similarity index 100%
rename from 1-gui/instance1.png
rename to 0-gui/images/instance1.png
diff --git a/1-gui/instance2.png b/0-gui/images/instance2.png
similarity index 100%
rename from 1-gui/instance2.png
rename to 0-gui/images/instance2.png
diff --git a/1-gui/instance3.png b/0-gui/images/instance3.png
similarity index 100%
rename from 1-gui/instance3.png
rename to 0-gui/images/instance3.png
diff --git a/1-gui/instance4.png b/0-gui/images/instance4.png
similarity index 100%
rename from 1-gui/instance4.png
rename to 0-gui/images/instance4.png
diff --git a/1-gui/instance5.png b/0-gui/images/instance5.png
similarity index 100%
rename from 1-gui/instance5.png
rename to 0-gui/images/instance5.png
diff --git a/1-gui/instance6.png b/0-gui/images/instance6.png
similarity index 100%
rename from 1-gui/instance6.png
rename to 0-gui/images/instance6.png
diff --git a/1-gui/instance7.png b/0-gui/images/instance7.png
similarity index 100%
rename from 1-gui/instance7.png
rename to 0-gui/images/instance7.png
diff --git a/1-gui/instance8.png b/0-gui/images/instance8.png
similarity index 100%
rename from 1-gui/instance8.png
rename to 0-gui/images/instance8.png
diff --git a/1-gui/network1.png b/0-gui/images/network1.png
similarity index 100%
rename from 1-gui/network1.png
rename to 0-gui/images/network1.png
diff --git a/1-gui/network2.png b/0-gui/images/network2.png
similarity index 100%
rename from 1-gui/network2.png
rename to 0-gui/images/network2.png
diff --git a/1-gui/network3.png b/0-gui/images/network3.png
similarity index 100%
rename from 1-gui/network3.png
rename to 0-gui/images/network3.png
diff --git a/1-gui/network4.png b/0-gui/images/network4.png
similarity index 100%
rename from 1-gui/network4.png
rename to 0-gui/images/network4.png
diff --git a/1-gui/network5.png b/0-gui/images/network5.png
similarity index 100%
rename from 1-gui/network5.png
rename to 0-gui/images/network5.png
diff --git a/1-gui/router1.png b/0-gui/images/router1.png
similarity index 100%
rename from 1-gui/router1.png
rename to 0-gui/images/router1.png
diff --git a/1-gui/router2.png b/0-gui/images/router2.png
similarity index 100%
rename from 1-gui/router2.png
rename to 0-gui/images/router2.png
diff --git a/1-gui/router3.png b/0-gui/images/router3.png
similarity index 100%
rename from 1-gui/router3.png
rename to 0-gui/images/router3.png
diff --git a/1-gui/router4.png b/0-gui/images/router4.png
similarity index 100%
rename from 1-gui/router4.png
rename to 0-gui/images/router4.png
diff --git a/1-gui/router5.png b/0-gui/images/router5.png
similarity index 100%
rename from 1-gui/router5.png
rename to 0-gui/images/router5.png
diff --git a/1-gui/router6.png b/0-gui/images/router6.png
similarity index 100%
rename from 1-gui/router6.png
rename to 0-gui/images/router6.png
diff --git a/1-gui/sign_in1.png b/0-gui/images/sign_in1.png
similarity index 100%
rename from 1-gui/sign_in1.png
rename to 0-gui/images/sign_in1.png
diff --git a/1-gui/sign_in2.png b/0-gui/images/sign_in2.png
similarity index 100%
rename from 1-gui/sign_in2.png
rename to 0-gui/images/sign_in2.png
diff --git a/1-gui/sign_in3.png b/0-gui/images/sign_in3.png
similarity index 100%
rename from 1-gui/sign_in3.png
rename to 0-gui/images/sign_in3.png
diff --git a/0-quickstart/README.md b/0-quickstart/README.md
deleted file mode 100644
index f20a147c7a24df3b8ee7a2c90de62aef83a9bcf1..0000000000000000000000000000000000000000
--- a/0-quickstart/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Quickstart
-
-Quickstart is intended for users that want to spin up a virtual machine instance in the cloud as quickly as possible.
-
-To create a virtual machine instance, you need to
-* sign in via the MetaCentrum cloud web interface,
-* create an *ssh* key pair or use an existing key pair,
-* set up or update a security group,
-* start a virtual machine instance,
-* log in to the running instance using *ssh* (secure shell).
-
-## Sign In
-The web interface is available at [https://cloud.muni.cz](https://cloud.muni.cz).
-
-To sign in,
-* select `ENIFRA CESNET`,
-* click on `Sign In`,
-* select your institution from the drop-down list (use the search box at the top as a filter),
-* provide your institution-specific sign-in credentials,
-* wait to be redirected back to our web interface.
-
-## Create Key Pair
-All virtual machine instances running in the cloud have to be accessed remotely. The most common way of accessing a virtual machine instance remotely is the secure shell - *ssh*. Using *ssh* requires a pair of cryptographic keys.
-
-1. To create a new *ssh* key pair, go to **Project > Compute > Key Pairs** and click the button "Create Key Pair"
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/CreateKeyPair1.png)
-{% endreveal %}
-2. Name your new key and click on "Create Key Pair" again. Avoid using special characters, if possible.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/CreateKeyPair2.png)
-{% endreveal %}
-3. You can see your newly created key pair and its fingerprint. We recommend you store the key in a safe location and back it up in case you accidentally delete it.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/CreateKeyPair3.png)
-{% endreveal %}
-
-## Update Security Group
-In OpenStack, all incoming traffic from external networks to virtual machine instances is blocked by default. You need to explicitly allow access to individual virtual machine instances and services via a security group.
-
-You need to add two new rules to be able to connect to your new instance (or any instance using the given security group). This is similar to setting up firewall rules on your router or server. If set up correctly, you will be able to access your virtual machine via *ssh* from your local terminal.
-
-1. Go to **Project >  Network > Security Groups**. Here you can see the default security group. You can either edit the default group by clicking on "Manage Rules" or create a new one. The simplest way is to edit the default group.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/SecurityGroups1.png)
-{% endreveal %}
-2. Click on "Add rule", choose "SSH" and leave the remaining fields unchanged. This will allow you to access your instance.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/SecurityGroups2.png)
-{% endreveal %}
-3. Click on "Add rule", choose "ALL ICMP" and leave the remaining fields unchanged. This will allow you to `ping` your instance.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/SecurityGroups3.png)
-{% endreveal %}
-
-## Start Instance
-1. Navigate to **Quickstart** and click on "Launch Instance".
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/qs1.png)
-{% endreveal %}
-2. Choose a name for your virtual machine.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/qs3-1.png)
-{% endreveal %}
-3. Choose an Operating System to run on your instance, also known as an **Image**.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/qs3-2.png)
-{% endreveal %}
-4. Choose a suitable size of the new instance, also known as a **Flavor**.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/qs3-3.png)
-{% endreveal %}
-5. Select the previously created *ssh* key pair by name.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/qs3-4.png)
-{% endreveal %}
-6. Click on "Launch instance" and wait until **Quickstart** provides you with information about the running virtual machine instance.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/qs4.png)
-{% endreveal %}
-7. *[Optionally]* Add a persistent volume to the running virtual machine instance.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/qs5.png)
-{% endreveal %}
-8. Close the dialog with "Finish" to return to the list of active instances.
-{% reveal text="Show Screenshot" %}
-  ![](/0-quickstart/qs6.png)
-{% endreveal %}
-
-## Log In
-Follow instructions provided by **Quickstart** and log in remotely:
-> ssh -i ${PATH_TO_SSH_KEY_FILE} ${USER}@${IP_ADDRESS}
diff --git a/0-quickstart/qs1.png b/0-quickstart/qs1.png
deleted file mode 100644
index af6c182d7271a8efc902188db28bc5a9bd8ab35d..0000000000000000000000000000000000000000
Binary files a/0-quickstart/qs1.png and /dev/null differ
diff --git a/0-quickstart/qs3-1.png b/0-quickstart/qs3-1.png
deleted file mode 100644
index 718edf861141677fccdc48d4c8deb03be5090f05..0000000000000000000000000000000000000000
Binary files a/0-quickstart/qs3-1.png and /dev/null differ
diff --git a/0-quickstart/qs3-2.png b/0-quickstart/qs3-2.png
deleted file mode 100644
index c7e5bf0b7dee647a406e684f46dced999817ca5c..0000000000000000000000000000000000000000
Binary files a/0-quickstart/qs3-2.png and /dev/null differ
diff --git a/0-quickstart/qs3-3.png b/0-quickstart/qs3-3.png
deleted file mode 100644
index b6d0c2661ee571d7de8c34cdbed8ab88fbd9ccb7..0000000000000000000000000000000000000000
Binary files a/0-quickstart/qs3-3.png and /dev/null differ
diff --git a/0-quickstart/qs3-4.png b/0-quickstart/qs3-4.png
deleted file mode 100644
index c529d05635166a4d714ae48ce0add5817eebcec9..0000000000000000000000000000000000000000
Binary files a/0-quickstart/qs3-4.png and /dev/null differ
diff --git a/0-quickstart/qs4.png b/0-quickstart/qs4.png
deleted file mode 100644
index 327c274150d28b89f2eac9ff1322d1dcc4f181cf..0000000000000000000000000000000000000000
Binary files a/0-quickstart/qs4.png and /dev/null differ
diff --git a/0-quickstart/qs5.png b/0-quickstart/qs5.png
deleted file mode 100644
index 9a1e074a5b7b16f8f7f279943310396a8f4e42e4..0000000000000000000000000000000000000000
Binary files a/0-quickstart/qs5.png and /dev/null differ
diff --git a/0-quickstart/qs6.png b/0-quickstart/qs6.png
deleted file mode 100644
index 3bde428984c0063623a01e3d24033a386324c4ae..0000000000000000000000000000000000000000
Binary files a/0-quickstart/qs6.png and /dev/null differ
diff --git a/2-cli/README.md b/1-cli/README.md
similarity index 79%
rename from 2-cli/README.md
rename to 1-cli/README.md
index 45063dd6be717ac50bcc5180942138e4088ad5fe..eefad069e531b10598b857cbd94edd99d5b25715 100644
--- a/2-cli/README.md
+++ b/1-cli/README.md
@@ -1,4 +1,4 @@
-# Command Line Interface
+# Using OpenStack's Command Line Interface
 
 ## Getting Credentials
 > TODO
diff --git a/FAQ.md b/FAQ.md
index 914213ee210af91ee73dd2c3a08ea4642df0380e..32aeaa4c838201c32d8e659388e5f3aab1671c3e 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -4,4 +4,8 @@
 Follow instructions for registering in [MetaCentrum](https://metavo.metacentrum.cz/en/application/index.html).
 
 ## I have an issue with OpenStack. Where do I report it?
-First, try to search the documentation for an answer to your problem. If all else fails, open a ticket with [helpdesk@ics.muni.cz](mailto:helpdesk@ics.muni.cz). When contacting Helpdesk, always include your *username* (upper right corner of the web interface) and *domain* with active *project* (upper left corner of the web interface) as well as a description of your problem and/or an error messsage if available.
+First, try to search the documentation for an answer to your problem. If all else fails, open a
+ticket with [cloud@metacentrum.cz](mailto:cloud@metacentrum.cz). When contacting Helpdesk, always
+include your *username* (upper right corner of the web interface) and *domain* with
+active *project* (upper left corner of the web interface) as well as a description of
+your problem and/or an error message if available.
diff --git a/README.md b/README.md
index f9ac1eb36baab8ef1be58d20587cfa30fc139e6d..98bdc49ac797940c7d0a7d7ba6fc5ca4b3a6fb59 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,15 @@ This guide aims to provide a basic walk-through for setting up your virtual infr
 The left sidebar can be used for navigation throughout the documentation. Individual
 pages of this guide can also be downloaded as PDFs for printing or later use.
 
-If you are a beginner, we recommend starting in the [Quickstart](0-quickstart/README.md)
+If you are a beginner, we recommend starting in the [Graphical User Interface](0-gui/README.md)
 section which will walk you through all the steps for starting your first virtual machine
 instance.
 
-Advanced users should start in the [Graphical User Interface](1-gui/README.md) or
-[Command Line Interface](2-cli/README.md) sections, as these are more suitable for complex
-use cases and exploration of available features.
+Advanced users should start in the [Command Line Interface](1-cli/README.md) section, as it is
+more suitable for complex use cases and exploration of available features.
+
+Frequently asked questions and corresponding answers can be found in the [FAQ](FAQ.md) section.
+Please, consult this section BEFORE contacting user support and/or HelpDesk.
 
 Bear in mind that this is not the complete documentation to OpenStack but rather a quick
 guide that is supposed to help you with elementary use of our infrastructure. If you need
diff --git a/SUMMARY.md b/SUMMARY.md
index 34d353b44803aafe0ad1f17b3a9eefad8bee8894..d87d5d4951cb607d3a50042bbfa2f8cbf84f2808 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -1,9 +1,8 @@
 # Summary
 
 * [Introduction](README.md)
-* [Quickstart](0-quickstart/README.md)
-* [Graphical User Interface](1-gui/README.md)
-* [Command Line Interface](2-cli/README.md)
+* [Graphical User Interface](0-gui/README.md)
+* [Command Line Interface](1-cli/README.md)
 * [FAQ](FAQ.md)
 * [Contribute](CONTRIBUTE.md)
 * [Glossary](GLOSSARY.md)
diff --git a/book.json b/book.json
index b695c094d88188e502fed323ff29cc51dec0485a..c4e5963d00477729e5d8a3c0e7ff7fb2866e2ac8 100644
--- a/book.json
+++ b/book.json
@@ -1,10 +1,9 @@
 {
   "title": "MetaCentrum Cloud User Documentation",
   "description": "This book aims to provide basic user manual for MetaCentrum Cloud users.",
-  "author": "Cloud Commando @ CESNET/ICS MU",
+  "author": "Cloud Commando @ CESNET MetaCentrum/ICS MU",
   "language": "en",
   "plugins": [
-    "click-reveal",
     "insert-logo-link-style",
     "get-book",
     "hints-istex"
diff --git a/package-lock.json b/package-lock.json
index a7a0b233dd54c76758e45e588f49ff3c8df60826..5a0d2d3c16d52e4c5a1dd5d5c65df1e5251af911 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,11 +2,6 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-    "gitbook-plugin-click-reveal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gitbook-plugin-click-reveal/-/gitbook-plugin-click-reveal-1.0.0.tgz",
-      "integrity": "sha1-xBQzr/C+BePt2AV9wJRFKAmfZUs="
-    },
     "gitbook-plugin-insert-logo-link-style": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/gitbook-plugin-insert-logo-link-style/-/gitbook-plugin-insert-logo-link-style-1.0.2.tgz",