Testing layout
Improved menu hierarchy