Updated Index controller