further layout work