Updated view and controller components