Revert "CGR Add FrameW. fix (duplication & UI)"

This reverts commit 231aacb322751d42f10ff15aa4dd21a9e56ad4ac.