Added new grids
Added different grids for different match types to reduce the amount of useless columns