more layout updates