Rearranged and renamed menu items