rafactoring and rm menu settings