Simplification of StateMainMenu to be used as a base
Merge pull request #914 from mkienenb/PR-setup-state

Simplification of StateMainMenu to be used as a base