more layout work