Updates for changes to layout