Fix to always add to existing layouts