Refactored graphics