Layout Completion

Verify design is fine via traces and via's; then order. Smaller than v1