continuing layout work