Minor changes to data and first go on custom item renderer for swiping(Stijn & Niels)