more layout cleanup.