[BUGFIX] Context CGL issues and relocate condition view helpers