Updated index and controllers