(Menu) Refactor settings