Issue: 441 - Fix Engine view