Return object reference in drawControls and drawBorders

Closes #556