Updated view and controller