multiple layout fixes