Added more demo data and fixed some layout issues