Modify data schema with picture urls
Change ui_logic?