More updates for the new layout