(Menu) Refactor more settings