Added mapping for dates and fixed images