Optimized layout for routing.  Added drill hits.