more layout clean up