added explicit layout identifiers