Text and style improvements