Changes for text and layout