Optimize Drawing and fix white line