Styling and logic enhancement.