Fix #1 - Provide better UI for displaying definitions