CMS-2197 ContextWindow - Regroup views