Refactored components for rendering.