Working ActionPlan index, still fixing Activities