Reorganizing content and adding extra info