Changed padding on the cells
Comments + filter simplification