Settings menu working again. Passing tests