Revising the menu shortcuts system (not complete)