added grid and popup