Added asset grouping to support multiple layouts