quick and dirty rework on the demo page. Illuminator pending