text and layout fixes