Restructured menu dialog
Restructured menu dialog