Added main/sub content wrappers