layout cleaning changes