Styling and translation improvement