Butter Chicken with Naan/Rice