Add the thumbnail generator call + fix issues with displays