Fixed issues with the demo display.