Reorder menu items. Fix references to some resources