Improved styling and layout