More switch types
Delay after display init to avoids corruption
WIP refactoring menu