Fixing some layout issues. Mandatory root layout. More demo code.