Added timeout to front-end display