More layout improvement and ground overlay correction.