Work started in updating layouts