#330 add grid layout for popup