(RMenu) Refactor rmenu