Rohit: Changed grouping on the landing Page and Fixed logic for displaying items in modal