ADD: Complete Draw + minor visual changes