Some more layout clean up.