Updated IndexController and TaskController