:gb: Improved drawing logic