Fixed a number of bugs in substructure draw panel, now drawing much faster.