Cleaned up the Demo Window a bit.