Issue: 441 - Refactor engine view