Port commander to new menu api