Continued work on the new layouts