fixed grid and added popular