Add rupc-item-listing height == 130px
Fix conflicts