Merge Issues #322 and #127

### Is your feature request related to a problem?

This issue just has the purpose to merge two other issues.

### Desired solution

Create one branch to merge the two mentioned issues above, as they depend on each other.

### Possible alternatives (optional)

_No response_

### Screenshots (optional)

_No response_

### Additional Context (optional)

_No response_