Updated options, added index function and controlClick callback