Improved styling