Add random data generator for all subcategories
Some fixes with GridView