Started initial layout work