revamp settings menu

