Refacto code structure
Fix some drawing glitch