Refactoring definition pane setup

Removes an annoying null reference bug.