Fix last minutes data and styling