diff --git a/docs/images/07-Deployment View.drawio.png b/docs/images/07-DeploymentView.drawio.png
similarity index 100%
rename from docs/images/07-Deployment View.drawio.png
rename to docs/images/07-DeploymentView.drawio.png
diff --git a/docs/images/DeplymentViewTest.drawio.png b/docs/images/07-DeploymentViewTest.drawio.png
similarity index 100%
rename from docs/images/DeplymentViewTest.drawio.png
rename to docs/images/07-DeploymentViewTest.drawio.png
diff --git a/docs/src/07_deployment_view.adoc b/docs/src/07_deployment_view.adoc
index 4f5b056e..646a05f3 100644
--- a/docs/src/07_deployment_view.adoc
+++ b/docs/src/07_deployment_view.adoc
@@ -5,15 +5,13 @@ ifndef::imagesdir[:imagesdir: ../images]
 
 == Deployment View
 
-[role="arc42help"]
-
 
 === Infrastructure Level 1
 
 
-image::07-Deployment View.drawio.png[title="Deployment View"]
+image::07-DeploymentView.drawio.png[title="Deployment View"]
 
-image::07-Deployment ViewTest.drawio.png[title="Deployment View Test environment"]
+image::07-DeploymentViewTest.drawio.png[title="Deployment View Test environment"]
 
 Motivation::
 
diff --git a/docs/src/12_glossary.adoc b/docs/src/12_glossary.adoc
index 192b2353..2fecd0ad 100644
--- a/docs/src/12_glossary.adoc
+++ b/docs/src/12_glossary.adoc
@@ -3,40 +3,40 @@ ifndef::imagesdir[:imagesdir: ../images]
 [[section-glossary]]
 == Glossary
 
-[role="arc42help"]
-****
-.Contents
-The most important domain and technical terms that your stakeholders use when discussing the system.
-
-You can also see the glossary as source for translations if you work in multi-language teams.
-
-.Motivation
-You should clearly define your terms, so that all stakeholders
-
-* have an identical understanding of these terms
-* do not use synonyms and homonyms
+[cols="e,2e" options="header"]
+|===
+|*Term* | *Definition*
 
+| React
+| JavaScript library that allows us to create interactive user interfaces in a simple way. It is based on components.
 
-.Form
+| Git
+| Software version control system.
 
-A table with columns <Term> and <Definition>.
+| GitHub
+| Cloud-based service that hosts the aforementioned version control system.
 
-Potentially more columns in case you need translations.
+| Wikidata
+| Website where the information is taken from
 
+| Docker_ 
+| A tool that makes it easy to create, deploy and run applications using containers.
 
-.Further Information
+| MongoDB
+| Open source, document-oriented database system.
 
-See https://docs.arc42.org/section-12/[Glossary] in the arc42 documentation.
+| JavaScript
+| Interpreted programming language based on prototypes, imperative and dynamic.
 
-****
+| CSS
+| Cascading Style Sheets. Graphic programming language oriented to define the repesentation of a document.
 
-[cols="e,2e" options="header"]
-|===
-|Term |Definition
+| Draw.io
+| Free application for diagramming.
 
-|<Term-1>
-|<definition-1>
+| Visual Studio Code
+| Independent source code editor.
 
-|<Term-2>
-|<definition-2>
+| Microsoft Azure
+| Cloud computing platform created by Microsoft to build, test, deploy and manage applications and services using its data centers.
 |===