changed the structure and content presentation, TODO: Add custom Layout