Menus display improvement. Only one "Commander" button appears.