Improve menu usability
Improve even more the codebase