Improved text and style