Cleaned up the demo thread control.
Couple of small windows tweaks.