Update user CP to use nested JS