Minor fixes in the demo layout