TODO:

- Mark heading and separators visually in the menu view
- Clean up runtime warnings
