Add more flexible engine display support

Fixes #22.