Code refactoring. Menu items are now ordered.