Some general tidying up of data preview section