Updated view engine