Added product category and fixed bugs