Final solution for menu issues (I hope)
Merge pull request #1121 from mfalesni/ff-part-deus

Final solution for menu issues (I hope)