(Menu) refactor more settings