Improved styles and format