diff --git a/propulsion_design/doc/Doxyfile b/propulsion_design/doc/Doxyfile
index 822a68a54a7dba599878064e3ee71d91b556d916..ab58873d64c2678f83b24fa4193c957a479729da 100644
--- a/propulsion_design/doc/Doxyfile
+++ b/propulsion_design/doc/Doxyfile
@@ -42,7 +42,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "propulsionDesign"
+PROJECT_NAME           = "propulsion_design"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -815,7 +815,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            =
+LAYOUT_FILE            = DoxygenLayout.xml
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -943,7 +943,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../src/ ./content/
+INPUT                  = ../src/ ./content
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1030,6 +1030,8 @@ FILE_PATTERNS          = *.c \
                          *.for \
                          *.vhd \
                          *.vhdl \
+                         *.png \
+                         *.svg \
                          *.ucf \
                          *.qsf \
                          *.ice
@@ -1097,7 +1099,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = ./img/
+IMAGE_PATH             = ./content/img
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1290,7 +1292,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = propulsionDesign
+HTML_OUTPUT            = propulsion_design
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
@@ -1423,7 +1425,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_MENUS     = NO
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
@@ -1673,7 +1675,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -1770,7 +1772,7 @@ FORMULA_MACROFILE      =
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_MATHJAX            = NO
+USE_MATHJAX            = YES
 
 # With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
 # Note that the different versions of MathJax have different requirements with
diff --git a/propulsion_design/doc/DoxygenLayout.xml b/propulsion_design/doc/DoxygenLayout.xml
index dfdd00372bb9b17ddc384b94b9efacdc1b79639e..1c663cc11e2e79db05b3dc8704c58139acc9e989 100644
--- a/propulsion_design/doc/DoxygenLayout.xml
+++ b/propulsion_design/doc/DoxygenLayout.xml
@@ -2,42 +2,14 @@
   <!-- Generated by doxygen 1.9.7 -->
   <!-- Navigation index tabs for HTML output -->
   <navindex>
-    <tab type="mainpage" visible="yes" title="Home"/>
-    <!-- <tab type="user" url="md_content_2mypage.html" title="Getting Started"/> -->
-    <tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="modules" visible="yes" title="" intro=""/>
-    <tab type="namespaces" visible="yes" title="">
-      <tab type="namespacelist" visible="yes" title="" intro=""/>
-      <tab type="namespacemembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="concepts" visible="yes" title="">
-    </tab>
-    <tab type="interfaces" visible="yes" title="">
-      <tab type="interfacelist" visible="yes" title="" intro=""/>
-      <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
-      <tab type="interfacehierarchy" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="classes" visible="yes" title="">
-      <tab type="classlist" visible="yes" title="" intro=""/>
-      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
-      <tab type="hierarchy" visible="yes" title="" intro=""/>
-      <tab type="classmembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="structs" visible="yes" title="">
-      <tab type="structlist" visible="yes" title="" intro=""/>
-      <tab type="structindex" visible="$ALPHABETICAL_INDEX" title=""/>
-    </tab>
-    <tab type="exceptions" visible="yes" title="">
-      <tab type="exceptionlist" visible="yes" title="" intro=""/>
-      <tab type="exceptionindex" visible="$ALPHABETICAL_INDEX" title=""/>
-      <tab type="exceptionhierarchy" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="files" visible="yes" title="">
-      <tab type="filelist" visible="yes" title="" intro=""/>
-      <tab type="globals" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="examples" visible="yes" title="" intro=""/>
-    <tab type="user" url="https://unicado.pages.rwth-aachen.de/unicado.gitlab.io/modules/overview/" title="Module Overview" />
+  <tab type="Main page" visible="yes" title="Home">
+  <tab type="user" url="engineeringprinciples.html" title="Engineering Principles" />
+  <tab type="user" url="getting-started.html" title="Getting Started" />
+  <tab type="user" url="softwarearchitecture.html" title="Software_Architecture" />
+  <tab type="user" url="changelog.html" title="Changelog" />
+  <tab type="user" url="additional.html" title="Additional Information" />
+  <tab type="user" visible="yes" title="←Back to Overview" url="https://unicado.pages.rwth-aachen.de/unicado.gitlab.io/documentation/overview/"/>
+  </tab>
   </navindex>
 
   <!-- Layout definition for a class page -->
diff --git a/propulsion_design/doc/content/additional.md b/propulsion_design/doc/content/additional.md
index 7f61c7b57fbec4c0cca6a99cacb6d289e17ec2f8..63d4ae2c0605fac4718793d669c566a4634650fd 100644
--- a/propulsion_design/doc/content/additional.md
+++ b/propulsion_design/doc/content/additional.md
@@ -1,4 +1,5 @@
 # Additional information {#additional}
 Here, you can find additional documentation on specific comments on the code:
+
 - @subpage propulsion
 - @subpage technology_factors_mass
\ No newline at end of file
diff --git a/propulsion_design/doc/content/changelog.md b/propulsion_design/doc/content/changelog.md
index f53d444e5fa23a3061eb020f88ccda72115799ea..7403ff41ee9a50ae4b9369bf7c29ae5a0f94a78b 100644
--- a/propulsion_design/doc/content/changelog.md
+++ b/propulsion_design/doc/content/changelog.md
@@ -14,7 +14,7 @@ The following changes are introduced:
 ### Bugfixes
 During the development of this release the following bugs were found and fixed:
 
-- When designing a *rubber* engine, the engine length was scaled incorrectly. The correct formula with \f${scale_{engine}}^{0.4}\f$ is now implemented.
+- When designing a *rubber* engine, the engine length was scaled incorrectly. The correct formula with \f${scale_{engine}}^{0.4} \f$ is now implemented.
 
 ### Changes in the CSR designs
 The implemented changes and bugfixes lead to the following changes in the results of the CSR designs.
diff --git a/propulsion_design/doc/content/engineeringprinciples.md b/propulsion_design/doc/content/engineering_principles.md
similarity index 91%
rename from propulsion_design/doc/content/engineeringprinciples.md
rename to propulsion_design/doc/content/engineering_principles.md
index 941847067319b7137b443dabc61e6ef567b1401b..416839504b4ea346d76277e94ce67c275dcadfb0 100644
--- a/propulsion_design/doc/content/engineeringprinciples.md
+++ b/propulsion_design/doc/content/engineering_principles.md
@@ -17,10 +17,9 @@ For these five disciplines, you can choose different **methods** (or fidelities)
 |Pylon designer       | *Default*                                                         |
 |Mass analyzer        | *Default*                                                         |
 
-If you want to learn more about how to configure methods or generally the settings and outputs, go to the @ref getting-started .
-How to actually extend the tool by a new method, is described in @ref tutorial_fidelity_extension .
+If you want to learn more about how to configure methods or generally the settings and outputs, go to the [getting started](getting_started.md).
 
-@important These disciplines are executed sequentially for EACH engine. That means that the engines are not aware of each other within the designing and analyzing. More information, see the [software architecture](#softwarearchitecture) section.
+@important These disciplines are executed sequentially for EACH engine. That means that the engines are not aware of each other within the designing and analyzing. More information, see the [software architecture](software_architecture.md) section.
 
 
 ## Engine designer {#enginedesigner}
@@ -32,35 +31,35 @@ The **engine designer** bases its principle on the common modelling practice usi
 - an _engine deck_ (operating point dependent)
 - a _scale factor_
 
-The _dataset_ (also called _EngineXML_) includes parameter which are independent of the flight condition such as outer engine dimensions (detailed information see @ref tutorial_engine_extension).
+The _dataset_ (also called _EngineXML_) includes parameter which are independent of the flight condition such as outer engine dimensions.
 
 The three-dimensional _engine deck_ contain engine performance data for different values of altitude \f$h\f$, Mach number \f$Ma\f$ and low-pressure engine spool speed \f$N1\f$. The most important performance parameter are thrust and fuel/energy flow. In UNICADO, the deck is split into multiple CSV files. The figure shows an example with values for thrust in kilo newton. The first block contains data for \f$N1=1\f$ for \f$Ma=0...0.9\f$ and \f$h=0...14000\f$. The second block below is for \f$N1=0.95\f$.
-![](../img/deck_example_thrust.svg)
+![](img/deck_example_thrust.svg)
 
 @note Detailed information on required dataset and deck data will be updated in near future. 
 
 The _scale factor_ is necessary because (as conceptual aircraft designer), we use the concept of a so-called _rubber engine_. That means that (depending on the method, see later) we create or assume an engine deck and provide one _scale factor_ to obtain all engine data acc. to the required thrust the engine shall provide. The figure visualized the concept:
-![](../img/scale_factor.svg)
+![](img/scale_factor.svg)
 
 @attention &rarr; **As mentioned and highlighted in the figure**, there is ONE _scale factor_ **BUT** multiple exponents which differ depending on which property you want to use. E.g. for the diameter, the exponent is \f$0.5\f$ and for the mass its \f$0.4\f$. **So important to remember** that whenever you want to use engine data, you need to access it via the `engine` library. In the following, a brief explanation of the scaling concept will be given - however details are given in the library documentation.
 
 So, the scaling is based on continuity principle assuming that the operating condition is constant (commonly known station numbering; assuming no pressure drop).
 
-\f[ 
+\f$[ 
     T = \dot m \cdot (V_9 - V_0) 
-\f]
+]\f$
 
 Therefore, thrust \f$T\f$ is proportional to the mass flow \f$\dot m\f$, which is related to the cross-sectional area \f$A\f$ of the engine. 
 
 \f$ \dot m = \rho \cdot V \cdot A = \rho \cdot V \cdot \pi \frac{d}{2}^2 \f$
 
-Because area $A$ is proportional to the square of the diameter $d$ , it follows that the diameter should be proportional to the square root of the scale factor. 
+Because area \f$A\f$ is proportional to the square of the diameter \f$d\f$ , it follows that the diameter should be proportional to the square root of the scale factor. 
 
 \f$ d_{new} = d_{ref} \cdot ( \frac{T_{new}}{T_{ref}} )^{0.5} \f$
 
 An exemplary simplified calculation (data from the V2527-A5): the current engine provides \f$127.27~kN\f$ as sea level static thrust, but for the design only \f$100~kN\f$ are needed. The scaling factor would be \f$0.7857\f$. Assuming an initial diameter \f$2~m\f$, the new diameter would be \f$1.773~m\f$ with the scaling factor of \f$(0.7857)^{0.5} = 0.8864\f$. 
 
-So, again, always access the engine data via the `engine` library to ensure that you have the correctly scaled data \emoji smile
+So, again, always access the engine data via the `engine` library to ensure that you have the correctly scaled data 🙂
 
 @note Actually, the sea level static thrust is not at \f$N1=1\f$ if you compare the dataset for this engine (for 110.31kN around \f$N1=0.95\f$). So the scaling factor will be slightly lower.
 
@@ -74,8 +73,6 @@ The **engine designer** includes different methods which create/use this deck in
 
 For all these methods, the approach of using the _scale factor_ is the same (see explaination [here](#generalprinciples)). A deck is either first created or assumed and then data is drawn with the `engine` library with the scaling approach. 
 
-Detailed information on the empirical estimation of different engine types (turbofan, turboprop, fuel cell..) or on how to create an engine deck with GasTurb, can be found in @ref tutorial_engine_extension.md .
-
 ## Propulsion integrator {#propulsionintegrator}
 Additionally to calculating the engine performance parameter, the engine has to be placed on the aircraft. The **propulsion integrator** uses the user settings from the aircraft exchange file - the following needs to be defined:
 - parent component: wing, fuselage, empennage
@@ -129,7 +126,7 @@ For the **pylon designer**, only one method is implemented:
  
 In the current method, the mounting is attached to the beginning to the nacelle to the leading edge of the wing. The length is the engine length which is extruded to the wing. the profile is, likewise for the nacelle, defined in the _configXML_.
 
-![](../img/engine-mount.svg)
+![Engine Mount](img/engine_mount.svg)
 
 
 @note the implementation include currently Turbofan Kerosene only
diff --git a/propulsion_design/doc/content/getting-started.md b/propulsion_design/doc/content/getting_started.md
similarity index 90%
rename from propulsion_design/doc/content/getting-started.md
rename to propulsion_design/doc/content/getting_started.md
index 3b7b98c879d985c640e51ba58f2445451f2812c3..8c6dc345bd1ee3010f93db1906c94d4460765e31 100644
--- a/propulsion_design/doc/content/getting-started.md
+++ b/propulsion_design/doc/content/getting_started.md
@@ -1,5 +1,5 @@
 # Getting started {#getting-started}
-This guide will show you the basic usage of **propulsionDesign**. Following steps are necessary (if you are new to UNICADO check out the [settings and outputs](#settingsandoutputs) first!)
+This guide will show you the basic usage of **propulsion_design**. Following steps are necessary (if you are new to UNICADO check out the [settings and outputs](#settingsandoutputs) first!)
 
 ## Step-by-step
 
@@ -13,8 +13,8 @@ It is assumed that you have the `UNICADO Package` installed including the execut
         - `plot_output` to false (or define `inkscape_path` and `gnuplot_path`)
     - in `program_settings`
         - `path_engine_database` to your respective settings
-        - `propulsion/nacelle/profile` and `pylon/profile` to `propulsionDesign/test/stubs` directory
-3. Open terminal and run **propulsionDesign**
+        - `propulsion/nacelle/profile` and `pylon/profile` to `propulsion_design/test/stubs` directory
+3. Open terminal and run **propulsion_design**
 
 Following will happen:
 - you see output in the console window
@@ -28,7 +28,7 @@ Generally, we use 2 files to set or configure in UNICADO:
 - the aircraft exchange file (or _acXML_) includes
     - data related inputs (e.g. thrust, offtakes or type of engine)
     - data related outputs (e.g. engine position)
-- the configuration file `propulsionDesign_conf.xml` (also _configXML_) includes
+- the configuration file `propulsion_design_conf.xml` (also _configXML_) includes
     - control settings (e.g. enable/disable generating plots)
     - program settings (e.g. set technology factors or methods)
 
@@ -41,20 +41,24 @@ Following is needed from the _acXML_:
 2) the system off-takes,
 3) the user settings of the propulsion architecture
 
-Naturally, the propulsion need an assumption for thrust or power to be designed. Currently, in UNICADO, the requirement is set via the tool _initialSizing_. Here, initial estimation based on the TLARs are calculated like the thrust-to-weight via an design chart or the maximum take-off mass based on regressions. For this, **propulsionDesign** currently assumes:
+Naturally, the propulsion need an assumption for thrust or power to be designed. Currently, in UNICADO, the requirement is set via the tool _initialSizing_. Here, initial estimation based on the TLARs are calculated like the thrust-to-weight via an design chart or the maximum take-off mass based on regressions. For this, **propulsion_design** currently assumes:
 
-\f$ T_0 = T/W \cdot MTOM \f$
+The sea level static thrust \f$ T_0 \f$ is given by:
 
-with 
-- \f$T_0\f$ as sea level static thrust, 
-- \f$T/W\f$ as thrust-to-weight ratio (`/aircraft_exchange_file/sizing_point/thrust_to_weight`) and 
-- \f$MTOM\f$ as maximum take-off mass (`/aircraft_exchange_file/analysis/masses_cg_inertia/maximum_takeoff_mass`).
+\f$
+T_0 = \frac{T}{W} \cdot MTOM
+\f$
+
+Where:
+- \f$ T_0 \f$ is the sea level static thrust.
+- \f$ \frac{T}{W} \f$  is the thrust-to-weight ratio (specified as `/aircraft_exchange_file/sizing_point/thrust_to_weight`).
+- \f$ MTOM \f$ is the maximum takeoff mass (specified as `/aircraft_exchange_file/analysis/masses_cg_inertia/maximum_takeoff_mass`).
 
 @note This might change with new propulsion architectures!
 
 Not only the thrust is important, but also the system off-takes. Current engine provide power to the systems and therefore, the thrust specific consumption can increase. To include that, the nodes `average_bleed_air_demand` and `average_bleed_air_demand` in `/aircraft_exchange_file/component_design/systems/specific/`are necessary (is set to default values if not existing).
 
-Additionally, the user settings need to be defined. In the node `/aircraft_exchange\_file/requirements_and_specifications/design_specification`, both `energy_carriers` and `propulsion` need to be filled out (for more information on the variables, please read the description in the _acXML_).
+Additionally, the user settings need to be defined. In the node `/aircraft_exchange_file/requirements_and_specifications/design_specification`, both `energy_carriers` and `propulsion` need to be filled out (for more information on the variables, please read the description in the _acXML_).
 
 ```plaintext
 Energy Carriers
@@ -118,7 +122,7 @@ To shorten the visualization, the nodes `mass`, `inertia` and `center_of_gravity
 
 ### Configuration file
 
-The control settings are standardized in UNICADO and will not be described in detail here. The program settings are structured like this (descriptions are in the `propulsionDesign_conf.xml`):
+The control settings are standardized in UNICADO and will not be described in detail here. The program settings are structured like this (descriptions are in the `propulsion_design_conf.xml`):
 ```plaintext
 Program Settings
 |- Method
@@ -241,4 +245,4 @@ You can choose the method for each discipline, the path for your engine data bas
     </analysis>
 </aircraft_exchange_file>
 ```
-The nodes `requirements_and_specifications\general` and `design_specification\configuration` are not needed by **propulsionDesign**. However, the library _moduleBasics_ requires them.
\ No newline at end of file
+The nodes `requirements_and_specifications\general` and `design_specification\configuration` are not needed by **propulsion_design**. However, the library _moduleBasics_ requires them.
\ No newline at end of file
diff --git a/propulsion_design/doc/img/class_diagram.png b/propulsion_design/doc/content/img/class_diagram.png
similarity index 100%
rename from propulsion_design/doc/img/class_diagram.png
rename to propulsion_design/doc/content/img/class_diagram.png
diff --git a/propulsion_design/doc/img/deck_example_thrust.svg b/propulsion_design/doc/content/img/deck_example_thrust.svg
similarity index 100%
rename from propulsion_design/doc/img/deck_example_thrust.svg
rename to propulsion_design/doc/content/img/deck_example_thrust.svg
diff --git a/propulsion_design/doc/img/different_engines.svg b/propulsion_design/doc/content/img/different_engines.svg
similarity index 100%
rename from propulsion_design/doc/img/different_engines.svg
rename to propulsion_design/doc/content/img/different_engines.svg
diff --git a/propulsion_design/doc/img/engine-mount.svg b/propulsion_design/doc/content/img/engine_mount.svg
similarity index 100%
rename from propulsion_design/doc/img/engine-mount.svg
rename to propulsion_design/doc/content/img/engine_mount.svg
diff --git a/propulsion_design/doc/img/scale_factor.svg b/propulsion_design/doc/content/img/scale_factor.svg
similarity index 100%
rename from propulsion_design/doc/img/scale_factor.svg
rename to propulsion_design/doc/content/img/scale_factor.svg
diff --git a/propulsion_design/doc/content/index.md b/propulsion_design/doc/content/index.md
index 74dab67806e0d0c0f96d40cb3afa89429d188541..9dbf8b6f292e5721f593ec93d39498ae8e5e04fe 100644
--- a/propulsion_design/doc/content/index.md
+++ b/propulsion_design/doc/content/index.md
@@ -1,14 +1,13 @@
 # Introduction {#mainpage}
-The tool _propulsionDesign_ is one of the core design tools in UNICADO. The overall goal is the design the propulsion based on... 
-- ... the architecture (e.g. 2 turbofan at rear fuselage, 4 fuel cell prop engine over the front wing) set by the user and,
-- ... the total required thrust and system off-takes.
-
-This tool is exiting \emoji fire because the propulsion is THE critical component providing the thrust or power, enabling to propel the aircraft forward and move through the skies. \emoji earth_africa
+The tool _propulsion_design_ is one of the core design tools in UNICADO. The overall goal is the design the propulsion based on... 
+- the architecture (e.g. 2 turbofan at rear fuselage, 4 fuel cell prop engine over the front wing) set by the user and,
+- the total required thrust and system off-takes.
+This tool is exciting!🔥 because the propulsion is THE critical component providing the thrust or power, enabling to propel the aircraft forward and move through the skies.🌍
 
 To give you a general taste, here are a few illustrations of possible concepts.
-![](../img/different_engines.svg)
+![](img/different_engines.svg)
 
-The @subpage getting-started gives you a first insight in how to execute the tool and how it generally works. To understand how the tools works in detail, the documentation is split into a @subpage engineeringprinciples and a  @subpage softwarearchitecture section. 
+The [getting started](getting_started.md) gives you a first insight in how to execute the tool and how it generally works. To understand how the tools works in detail, the documentation is split into a [engineering principles](engineering_principles.md) and a [software architecture](software_architecture.md) section. 
 
 Prior to that, let's summarize what the tool can currently do and what is planned (terms like _method_ or _strategy_ will be explained in the sections):
 
diff --git a/propulsion_design/doc/content/softwarearchitecture.md b/propulsion_design/doc/content/software_architecture.md
similarity index 77%
rename from propulsion_design/doc/content/softwarearchitecture.md
rename to propulsion_design/doc/content/software_architecture.md
index a162ef11f2c2f5f0c27ce3b530b2123eb44c62a1..3fed44e7966e88ca8ecddeb3a9fb0209fc502a1d 100644
--- a/propulsion_design/doc/content/softwarearchitecture.md
+++ b/propulsion_design/doc/content/software_architecture.md
@@ -2,14 +2,14 @@
 
 ## Software Architecture Overview
 
-The software architecture is structured into various modules and packages, each handling specific task. Below is a description of the main components (some classes, interfaces etc. are left out to keep it understandable for now - for more information see the [class diagram](#classdiagram) or the source code):
+The software architecture is structured into various modules and packages, each handling specific task. Below is a description of the main components (some classes, interfaces etc. are left out to keep it understandable for now - for more information see the [class diagram](img/class_diagram.png) or the source code):
 
 - classes:
-    - **PropulsionDesign** is like the "coordinator" responsible for the overall propulsion system design including _initialize_, _run_, _update_, _report_ and _save_ (inherits from `Module` class from **moduleBasics**). These include e.g. method selection function for each disciplines
+    - **propulsionDesign** is like the "coordinator" responsible for the overall propulsion system design including _initialize_, _run_, _update_, _report_ and _save_ (inherits from `Module` class from **moduleBasics**). These include e.g. method selection function for each disciplines
     - **Propulsion** represents a generic propulsion system defining the detailed attributes and functionalities like setter and getter for e.g. dimensions (`template` class parameterized by `EnergyCarrier`).
     - **Turbofan** and **Turboprop** specializes engine type specific attributes and functions like `bypass_ratio()` for a turbofan (inherits from `Propulsion` class)
 - domains:
-    - **report** manages the generation of plots and HTML reports from the **propulsionDesign** data
+    - **report** manages the generation of plots and HTML reports from the **propulsion_design** data
     - **design** includes the strategies for **engine designer** and **propulsion integrator** into the aircraft, covering different propulsion types and configurations.
     - **geometry** includes the strategies for **nacelle designer** and **pylon designer**.
     - **mass** includes the strategies for **mass analyzer**
@@ -17,11 +17,11 @@ The software architecture is structured into various modules and packages, each
 - packages/libraries:
     - **moduleBasics** provides the basis structure for the modular approach of the UNICADO tools. The tools are intended to follow the _Strategy Design Pattern_ to execute at different fidelity levels (more information see libraries)
 - interfaces:
-    - **propulsionStrategy** populates the _Strategy Design Pattern_ for **propulsionDesign** including the template and the specification methods.
+    - **propulsionStrategy** populates the _Strategy Design Pattern_ for **propulsion_design** including the template and the specification methods.
 
 Some additional words on the **propulsionStrategy**:
 
-As you might also see in the [class diagram](#classdiagram), the core of it is the functor `operator()` for specific engine types to allow the `engine` object to be used as functions. This object is, depending on the user settings, based on the propulsion type classes (e.g. `Turbofan<Kerosene>`). As also shown in @ref propulsion.md, the type is combined with 3 "building blocks"
+As you might also see in the [class diagram](img/class_diagram.png), the core of it is the functor `operator()` for specific engine types to allow the `engine` object to be used as functions. This object is, depending on the user settings, based on the propulsion type classes (e.g. `Turbofan<Kerosene>`). As also shown in @ref propulsion.md, the type is combined with 3 "building blocks"
  - *powertrain*: Way the power is generated from the source: turbo, electric, fuel_cell
  - *type*: Type of main thrust generator: fan or prop
  - *energy_carrier*: kerosene, liquid_hydrogen, battery (handled over IDs)
@@ -31,4 +31,4 @@ So, if you want to use different combinations in UNICADO, you need to make sure
 ## Class Diagram {#classdiagram}
 Here is an overview how the module is structured:
 
-![](../img/class_diagram.png){html: width=1000}
+![](img/class_diagram.png){html: width=1000}
diff --git a/propulsion_design/doc/content/tutorial.md b/propulsion_design/doc/content/tutorial.md
deleted file mode 100644
index 26750634576e39cee7b049aa94a0b739567ee81a..0000000000000000000000000000000000000000
--- a/propulsion_design/doc/content/tutorial.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Tutorials
-@note The idea would be to explain here how developer can extend e.g. for a new fidelity and/or a new engine type.
-
-E.g.
-- @subpage tutorial_fidelity_extension
-- @subpage tutorial_engine_extension
\ No newline at end of file
diff --git a/propulsion_design/doc/content/tutorial_engine_extension.md b/propulsion_design/doc/content/tutorial_engine_extension.md
deleted file mode 100644
index 0ce81dc68b20b2479f6e5d98a3d08cc3fbab5a61..0000000000000000000000000000000000000000
--- a/propulsion_design/doc/content/tutorial_engine_extension.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Tutorial engine extension {#tutorial_engine_extension}
-@note The idea is explain e.g. what an engine deck is (is just shortly mentioned in on main page), how to create an engine deck in Gasturb or research an empirical estimation of a new engine type
\ No newline at end of file
diff --git a/propulsion_design/doc/content/tutorial_fidelity_extension.md b/propulsion_design/doc/content/tutorial_fidelity_extension.md
deleted file mode 100644
index 5e1c9e2845ad9ff9d15a68235a6a278f8f98075a..0000000000000000000000000000000000000000
--- a/propulsion_design/doc/content/tutorial_fidelity_extension.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Tutorial fidelity extension {#tutorial_fidelity_extension}
-Idea is to provide a step by step appraoch how to extend this model by another fidelity
\ No newline at end of file
diff --git a/propulsion_design/doc/header.html b/propulsion_design/doc/header.html
index 92af47f3626ceda42aa580af1e89b3ef68bfa29b..53a28715cdb926d696b035272e0092877ca4181f 100644
--- a/propulsion_design/doc/header.html
+++ b/propulsion_design/doc/header.html
@@ -28,6 +28,10 @@
 <script type="text/javascript">
     DoxygenAwesomeFragmentCopyButton.init()
 </script>
+<!-- Add MathJax for rendering LaTeX math -->
+<script type="text/javascript" async
+  src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-MML-AM_CHTML">
+</script>
 $treeview
 $search
 $mathjax