Some optimizations in menu structure and navigation