Filled out wire drawing modes; 2 more

Added UserSettings class
Continued phasing out of layout package (diagramming will now be handled
by the individual Components)