popup problem resolved and chart and grid page merge
popup changes