Layout cleanup.