more layout cleanup