layout clean up