CS Fixes, scene customization