Nice rework. I'm 100% sure all my remaining complaints are directed toward the tool, not the designer. 
OP: Do yourself a huge favor and give some dedicated PCB design packages a shot. There are a few common ones that get mentioned around here. Eagle being the most popular, but possibly most complicated, of the free(-ish) ones. Fritzing is a nice tool to graphically depict a design you have on a real-world breadboard for others to look at, but IMO, not much beyond that.