Refactored rendering.