premature layout fixes