fixes for curtain panel and grid and conversion typo