Settings revamp & billing tracking