Minor refactoring: Command architecture

Fixed: focusing menu item if it is the only one in the list