more material layout fixes