Modified layout of main board components.  Replaced more wires with net labels.