Got rid of some vias and moved lots of component labels around