More updates to the layout.