Merging branches due to conflicts

Johann Ritterrequested to merge
5-create-functional-ui into main

Problems ocurred due to insufficient splitting of tasks in branches. All progress will be merged to main in order to restore functionality.

Merge request reports