More updates to _Layout