Some finetuning in layout and initial demo data