Update for latest changes in layout