More Layout cleanup.