fixed tultips and added modal