On going layout work