Layout cleanup