Fixed: refactoring of the retina drawing feature