Refactor status drawing