print and layout fixes