Minor changes with Interactivity switch