Added  tooltips and increased timeout