SubviewContainer-refactor