Add Control Group options demo, clean up some demos
Fix a few broken demos