re-arrange role and menu-items
fix conflict