Fix Menu order and update some names