More updates to layout