layout clean up.