[TASK] Adapt changes introduced by deferred rendering
Merge pull request #195 from bjo3rnf/menufix

[TASK] Adapt changes introduced by deferred rendering