latest integration & layout work