That looks fine now. For the green thru-hole pads, I don't know your dimensions but are the holes a bit small?