Cleanup of various sections in response to slide changes
More tweaks due to slide changes