(Menu) Refactor settings pt. 2