More updates to layout.