Fixes issue #600.
Debug toolbar WIP