Styling and security improvements