Settings revamp