Adding initial layout work