improvements on the text and layout