update wiki
reorder menus, fix typos