Better handling of linked layers with list/card within different modes