Clean up markup, add more meaningful mock data