Refactor frontend part 7

[RichDom2185]

Description

Supersedes #2518.

Type of change

• [ ] Bug fix (non-breaking change which fixes an issue)
• [ ] New feature (non-breaking change which adds functionality)
• [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
• [ ] This change requires a documentation update
• [x] Code quality improvements

How to test

Checklist

• [x] I have tested this code
• [ ] I have updated the documentation