added noPo support & fixed masonry