Updated controller, index, view templates