Bug fixes
Adding customized view engine