Minor change cleanup

Moved switch and battery connector.  Cleaned up tracks in preparation
for a redo on the layout.